fix bug in read_memory_usage

diff --git a/Makefile b/Makefile
index b7dfb0f7a1038e8e6a75a878a9fa6a2b0705cb28..3b26eb02a4a2494ea5f10ceef03376baec9785ac 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 RELEASE=2.2
 
 VERSION=1.0
-PKGREL=34
+PKGREL=35
 
 PACKAGE=libpve-common-perl
 

diff --git a/data/PVE/ProcFSTools.pm b/data/PVE/ProcFSTools.pm
index bdb6e52abe86a85e78a2e71c371117138b50cfcc..d501082f2efe07e0a5a325d01495ff17f6c8b53a 100644 (file)
--- a/data/PVE/ProcFSTools.pm
+++ b/data/PVE/ProcFSTools.pm
@@ -210,7 +210,7 @@ sub read_memory_usage {
 
     my $line = PVE::Tools::file_read_firstline("/proc/$$/statm");
 
-    if ($line =~ m/^(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+/) {
+    if ($line =~ m/^(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s*/) {
        $res->{size} = $1*$ps;
        $res->{resident} = $2*$ps;
        $res->{shared} = $3*$ps;

diff --git a/debian/changelog b/debian/changelog
index 94b19188ba55878391a8b49af40f8f5af02324db..5ebd7b4c1c60923a34cec8d7e9e194299d9bcea3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libpve-common-perl (1.0-35) unstable; urgency=low
+
+  * fix bug in read_memory_usage
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 15 Oct 2012 06:32:30 +0200
+
 libpve-common-perl (1.0-34) unstable; urgency=low
 
   * file_read_firstline: avoid warning with empty files