From: Dyre Tjeldvoll Date: October 8 2012 11:02am Subject: bzr push into mysql-5.5-cluster-7.2 branch (Dyre.Tjeldvoll:4089 to 4090) List-Archive: http://lists.mysql.com/commits/144980 Message-Id: <20121008110227.15850.78980.4090@khepri17.no.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 4090 Gunn Olaussen 2012-10-08 Fix MacOS HostInfo bug modified: storage/ndb/mcc/clusterhost.py 4089 Dyre Tjeldvoll 2012-10-05 Fixing failing backend unit test modified: storage/ndb/mcc/tst/tst_main.py === modified file 'storage/ndb/mcc/clusterhost.py' --- a/storage/ndb/mcc/clusterhost.py 2012-09-20 12:19:53 +0000 +++ b/storage/ndb/mcc/clusterhost.py 2012-10-08 11:01:54 +0000 @@ -112,7 +112,7 @@ class MacHostInfo(HostInfo): """x""" def _get_hostInfo(self): - sysinfo = self.ch.exec_blocking(['/usr/sbin/sysctl' 'hw.']) + sysinfo = self.ch.exec_blocking(['/usr/sbin/sysctl', 'hw.']) ram = [int(filter(str.isdigit, ln.split()[1])) for ln in sysinfo.split('\n') if 'hw.memsize:' in ln][0] / 1024 / 1024 cores = [int(filter(str.isdigit, ln.split()[1])) for ln in sysinfo.split('\n') if 'hw.ncpu:' in ln][0] return { 'host': { 'name' : self.ch.host }, No bundle (reason: useless for push emails).