From: Jelte Jansen <jelte@isc.org>
Date: Wed, 8 Aug 2012 19:37:07 +0000 (-0700)
Subject: [2172] fix page_size regex
X-Git-Tag: trac2351_base~65^2~34^2~2^2^2~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=121e490ee2758601ee3443fcd4b53686f7283701;p=thirdparty%2Fkea.git

[2172] fix page_size regex
---

diff --git a/src/lib/python/isc/sysinfo/sysinfo.py b/src/lib/python/isc/sysinfo/sysinfo.py
index 5f9b97ffab..37446f9b7c 100644
--- a/src/lib/python/isc/sysinfo/sysinfo.py
+++ b/src/lib/python/isc/sysinfo/sysinfo.py
@@ -446,7 +446,7 @@ class SysInfoOSX(SysInfoFreeBSDOSX):
             # store all values in a dict
             values = {}
             page_size = None
-            page_size_re = re.compile('page size of [0-9]+ bytes')
+            page_size_re = re.compile('.*page size of ([0-9]+) bytes')
             for line in lines:
                 page_size_m = page_size_re.match(line)
                 if page_size_m:
@@ -456,7 +456,7 @@ class SysInfoOSX(SysInfoFreeBSDOSX):
                     values[key] = value.strip()[:-1]
             # Only calculate memory if page size is known
             if page_size is not None:
-                self._mem_free = int(values['Pages free']) * page_size +
+                self._mem_free = int(values['Pages free']) * page_size +\
                                  int(values['Pages speculative']) * page_size
         except (subprocess.CalledProcessError, OSError):
             pass