bzr push into mysql-5.5-cluster-7.2 branch (Dyre.Tjeldvoll:4155 to 4156)

[Dyre Tjeldvoll]

 4156 Dyre Tjeldvoll	2013-01-14
      Add python byte compilation files to rpm spec

    modified:
      storage/ndb/mcc/ndb_setup
      support-files/mysql.spec.sh
 4155 Dyre Tjeldvoll	2013-01-11
      Add missing str()

    modified:
      storage/ndb/mcc/util.py
=== modified file 'storage/ndb/mcc/ndb_setup'
--- a/storage/ndb/mcc/ndb_setup	2012-12-06 14:03:02 +0000
+++ b/storage/ndb/mcc/ndb_setup	2013-01-14 13:25:01 +0000
@@ -1,35 +1,35 @@
-#! /usr/bin/env python
-"""Launch script for the configurator backend. Parses command line options and starts the web server."""
-
-import sys
-import platform
-import os.path
-
-def num_pyver(vn):
-    if isinstance(vn, str): 
-        return int(filter(str.isdigit, vn))
-    return vn
-
-def num_py_major_minor_tuple():
-    return map(num_pyver, platform.python_version_tuple()[0:2])
-
-
-install_bindir = 'bin'
-if __name__ == '__main__':
-    abs_install_bindir = os.path.dirname(os.path.abspath(sys.argv[0]))
-    try:
-        prefix = abs_install_bindir[0:abs_install_bindir.rindex(install_bindir)]
-    except ValueError:
-        prefix = abs_install_bindir
-
-    abs_install_subdir = os.path.normpath(os.path.join(prefix, 
-                                                       'share/mcc'))
-    sys.path.append(abs_install_subdir)
-
-    (pymajor, pyminor) = num_py_major_minor_tuple()
-    assert (pymajor == 2 and pyminor >= 6), 'Unsupported Python version: '+str(platform.python_version())
-    sys.path.append('/usr/local/lib/bzr-2.1.0-2010.03/lib/python2.6/site-packages')
-
-    import request_handler
-    request_handler.main(prefix, abs_install_subdir)
-        
+#! /usr/bin/env python
+"""Launch script for the configurator backend. Parses command line options and starts the web server."""
+
+import sys
+import platform
+import os.path
+
+def num_pyver(vn):
+    if isinstance(vn, str): 
+        return int(filter(str.isdigit, vn))
+    return vn
+
+def num_py_major_minor_tuple():
+    return map(num_pyver, platform.python_version_tuple()[0:2])
+
+
+install_bindir = ''
+if __name__ == '__main__':
+    abs_install_bindir = os.path.dirname(os.path.abspath(sys.argv[0]))
+    try:
+        prefix = abs_install_bindir[0:abs_install_bindir.rindex(install_bindir)]
+    except ValueError:
+        prefix = abs_install_bindir
+
+    abs_install_subdir = os.path.normpath(os.path.join(prefix, 
+                                                       '.'))
+    sys.path.append(abs_install_subdir)
+
+    (pymajor, pyminor) = num_py_major_minor_tuple()
+    assert (pymajor == 2 and pyminor >= 6), 'Unsupported Python version: '+str(platform.python_version())
+    sys.path.append('/usr/local/lib/bzr-2.1.0-2010.03/lib/python2.6/site-packages')
+
+    import request_handler
+    request_handler.main(prefix, abs_install_subdir)
+        

=== modified file 'support-files/mysql.spec.sh'
--- a/support-files/mysql.spec.sh	2012-12-13 11:51:36 +0000
+++ b/support-files/mysql.spec.sh	2013-01-14 13:25:01 +0000
@@ -1104,7 +1104,7 @@ echo "====="                            
 %attr(755, root, root) %{_bindir}/ndb_select_count
 %attr(755, root, root) %{_bindir}/ndb_show_tables
 %attr(755, root, root) %{_bindir}/ndb_waiter
-%attr(755, root, root) %{_bindir}/ndb_setup.py
+%attr(755, root, root) %{_bindir}/ndb_setup.*
 %attr(755, root, root) %{_bindir}/ndb_setup
 
 %if %(test "@MEMCACHED_ROOT_DIR@" '!=' "MEMCACHED_ROOT_DIR-NOTFOUND" && echo 1 || echo 0)

No bundle (reason: useless for push emails).