I will not rely on line numbers in /proc/meminfo.

I will not rely on line numbers in /proc/meminfo.
I will not rely on line numbers in /proc/meminfo.
(fix swap detection during upgrade)

1 files changed, 7 insertions, 6 deletions

diff --git a/iutil.py b/iutil.py
index 9254fd168..7711ade05 100644
--- a/iutil.py
+++ b/iutil.py
@@ -397,13 +397,14 @@ esac
 
 def swapAmount():
     f = open("/proc/meminfo", "r")
-    mem = f.readlines()[2]
-    del f
-
-    fields = string.split(mem)
-    mem = int(long (fields[1]) / 1024)
+    lines = f.readlines()
+    f.close()
 
-    return mem
+    for l in lines:
+        if l.startswith("SwapTotal:"):
+            fields = string.split(l)
+            return int(fields[1])
+    return 0
         
 def copyDeviceNode(src, dest):
     """Copies the device node at src to dest by looking at the type of device,