bzr push into mysql-5.5-cluster-7.2 branch (sivert.sorumgaard:4068 to 4069)

[Sivert Sorumgard]

 4069 Sivert Sorumgard	2012-09-20
      Fix installdir suggested by mcc back end

    modified:
      storage/ndb/mcc/clusterhost.py
      storage/ndb/mcc/ndb_setup.template
      storage/ndb/mcc/request_handler.py
 4068 Sivert Sorumgard	2012-09-20
      Display error message if failing to get host resource information

    modified:
      storage/ndb/mcc/frontend/js/mcc/gui/clusterdef.js
      storage/ndb/mcc/frontend/js/mcc/storage/MCCStorage.js
=== modified file 'storage/ndb/mcc/clusterhost.py'

=== modified file 'storage/ndb/mcc/clusterhost.py'
--- a/storage/ndb/mcc/clusterhost.py	2012-09-17 11:32:04 +0000
+++ b/storage/ndb/mcc/clusterhost.py	2012-09-20 11:23:51 +0000
@@ -75,7 +75,7 @@
         remote = self.uname
         if (local == 'Windows' and (remote == 'CYGWIN' or remote == 'Windows')) or (local != 'Windows' and remote != 'CYGWIN' and remote != 'Windows'):
             _logger.debug('localhost and remote are similar type, apply local paths')
-            reply['hostRes']['installdir'] = request_handler.configdir
+            reply['hostRes']['installdir'] = request_handler.basedir
             reply['hostRes']['datadir'] = os.path.expanduser('~/MySQL_Cluster/data')
 
         return reply

=== modified file 'storage/ndb/mcc/ndb_setup.template'
--- a/storage/ndb/mcc/ndb_setup.template	2012-09-12 12:34:12 +0000
+++ b/storage/ndb/mcc/ndb_setup.template	2012-09-20 11:23:51 +0000
@@ -31,5 +31,5 @@
     sys.path.append('/usr/local/lib/bzr-2.1.0-2010.03/lib/python2.6/site-packages')
 
     import request_handler
-    request_handler.main(abs_install_subdir)
+    request_handler.main(prefix, abs_install_subdir)
         

=== modified file 'storage/ndb/mcc/request_handler.py'
--- a/storage/ndb/mcc/request_handler.py	2012-09-20 08:33:37 +0000
+++ b/storage/ndb/mcc/request_handler.py	2012-09-20 11:23:51 +0000
@@ -348,12 +348,15 @@
             SocketServer.TCPServer.close_request(self, request)
 
 configdir = None
+basedir = None
         
-def main(cfgdir):
+def main(prefix, cfgdir):
     """Server's main-function which parses the command line and starts up the server accordingly.
     """
     global configdir 
+    global basedir 
     configdir = cfgdir
+    basedir = prefix
     frontend = os.path.join(cfgdir, 'frontend')
     if not os.path.exists(os.path.join(frontend, 'dojo')):
         dojoz = zipfile.ZipFile(os.path.join(frontend, 'dojo.zip'), 'r')

No bundle (reason: useless for push emails).