git://git.onelab.eu
/
bootmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
was meant with previous commit
[bootmanager.git]
/
source
/
systeminfo.py
diff --git
a/source/systeminfo.py
b/source/systeminfo.py
index
cdbbb0d
..
a0de777
100755
(executable)
--- a/
source/systeminfo.py
+++ b/
source/systeminfo.py
@@
-62,7
+62,7
@@
def get_total_phsyical_mem(vars = {}, log = sys.stderr):
try:
meminfo_file = file(PROC_MEMINFO_PATH,"r")
try:
meminfo_file = file(PROC_MEMINFO_PATH,"r")
- except IOError
,
e:
+ except IOError
as
e:
return
total_memory = None
return
total_memory = None
@@
-71,7
+71,7
@@
def get_total_phsyical_mem(vars = {}, log = sys.stderr):
try:
(fieldname,value) = string.split(line,":")
try:
(fieldname,value) = string.split(line,":")
- except ValueError
,
e:
+ except ValueError
as
e:
# this will happen for lines that don't have two values
# (like the first line on 2.4 kernels)
continue
# this will happen for lines that don't have two values
# (like the first line on 2.4 kernels)
continue