diff options
author | Erik Troan <ewt@redhat.com> | 2001-03-09 01:58:36 +0000 |
---|---|---|
committer | Erik Troan <ewt@redhat.com> | 2001-03-09 01:58:36 +0000 |
commit | 8073538c0b99d7735393f5ab1d690debc441d318 (patch) | |
tree | 6c3f730ca99c3bd4e58f739c7e6f90ab048679de /iutil.py | |
parent | 7de24f9626ec693b17c143462a578d7ce6da06c8 (diff) | |
download | anaconda-8073538c0b99d7735393f5ab1d690debc441d318.tar.gz anaconda-8073538c0b99d7735393f5ab1d690debc441d318.tar.xz anaconda-8073538c0b99d7735393f5ab1d690debc441d318.zip |
1) added swapAmount()
2) use proper long number for reading /proc/meminfo
Diffstat (limited to 'iutil.py')
-rw-r--r-- | iutil.py | 17 |
1 files changed, 12 insertions, 5 deletions
@@ -184,12 +184,8 @@ def memInstalled(corrected = 1): mem = f.readlines()[1] del f - # patch from hjl fields = string.split(mem) - try: - mem = int(fields[1]) / 1024 - except: - mem = 2097151 + mem = int(long(fields[1]) / 1024) if corrected: mem = mem - memoryOverhead @@ -354,3 +350,14 @@ esac execWithRedirect('/bin/sh', args, stdin = None, stdout = None, stderr = None, root = root) + +def swapAmount(): + f = open("/proc/meminfo", "r") + mem = f.readlines()[2] + del f + + fields = string.split(mem) + mem = int(long (fields[1]) / 1024) + + return mem + |