Change in vdsm[master]: trivial: Use os.uname to get kernel version insteaf of readi...

Mark Wu has uploaded a new change for review.

Change subject: trivial: Use os.uname to get kernel version insteaf of reading proc files
......................................................................

trivial: Use os.uname to get kernel version insteaf of reading proc files

Change-Id: I0bcb4326d6ce4a41486352e11683c83879b61887
Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com&gt;
---
M vdsm/caps.py
1 file changed, 6 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/74/12874/1

diff --git a/vdsm/caps.py b/vdsm/caps.py
index 38e47be..613de0c 100644
--- a/vdsm/caps.py
+++ b/vdsm/caps.py
@@ -312,18 +312,13 @@
 def _getKeyPackages():
     def kernelDict():
         try:
-            with open('/proc/sys/kernel/osrelease', "r") as f:
-                ver, rel = f.read().strip().split('-', 1)
+            ret = os.uname()
+            ver, rel = ret[2].split('-', 1)
+            t = time.mktime(time.strptime(' '.join(ret[3].split()[2:]),
+                                          "%a %b %d %H:%M:%S %Z %Y"))
         except:
-            logging.error('kernel release not found', exc_info=True)
-            ver, rel = '0', '0'
-        try:
-            t = file('/proc/sys/kernel/version').read().split()[2:]
-            del t[4]  # Delete timezone
-            t = time.mktime(time.strptime(' '.join(t)))
-        except:
-            logging.error('kernel build time not found', exc_info=True)
-            t = '0'
+            ver, rel, t = '0', '0', '0'
+            logging.error('kernel version not found', exc_info=True)
         return dict(version=ver, release=rel, buildtime=t)
 
     pkgs = {'kernel': kernelDict()}


--
To view, visit http://gerrit.ovirt.org/12874
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0bcb4326d6ce4a41486352e11683c83879b61887
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com&gt;