From b542c6449e32ed913fecb480aaa40e38c981d7fc Mon Sep 17 00:00:00 2001
From: Nagy Karoly Gabriel <karasz@home.(none)>
Date: Sat, 3 Apr 2010 12:19:36 +0300
Subject: [PATCH 1/3] ecn-robots: begin replacing shell calls with pythonisms

---
 vserver.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/vserver.py b/vserver.py
index 8302208..1bce31b 100644
--- a/vserver.py
+++ b/vserver.py
@@ -162,8 +162,9 @@ class Host(object):
     @property
     def info(self):
         information= {'kernel':'', 'uptime':'' }
-        returncode, kernel = self.p.run([u'uname', u'-r'])
-        information['kernel'] = kernel.strip()
+#        returncode, kernel = self.p.run([u'uname', u'-r'])
+#        information['kernel'] = kernel.strip()
+        information['kernel'] = os.uname()[3]
         secs = math.ceil(float(self.p.read_binary(u'/proc/uptime').split()[1]))
         information['uptime'] = self.p.convert_human(secs)
         return information

From b3517626c1bf0ab18d3c5eaff05d40040c31518b Mon Sep 17 00:00:00 2001
From: Nagy Karoly Gabriel <karasz@home.(none)>
Date: Sat, 3 Apr 2010 12:33:40 +0300
Subject: [PATCH 2/3] ecn-robots: off by one in uname resolved.

---
 vserver.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vserver.py b/vserver.py
index 1bce31b..2878a21 100644
--- a/vserver.py
+++ b/vserver.py
@@ -164,7 +164,7 @@ class Host(object):
         information= {'kernel':'', 'uptime':'' }
 #        returncode, kernel = self.p.run([u'uname', u'-r'])
 #        information['kernel'] = kernel.strip()
-        information['kernel'] = os.uname()[3]
+        information['kernel'] = os.uname()[2]
         secs = math.ceil(float(self.p.read_binary(u'/proc/uptime').split()[1]))
         information['uptime'] = self.p.convert_human(secs)
         return information

From 1d0c918479573fe8552a045cfd168fd3e8a4da89 Mon Sep 17 00:00:00 2001
From: Nagy Karoly Gabriel <karasz@home.(none)>
Date: Sat, 3 Apr 2010 12:38:01 +0300
Subject: [PATCH 3/3] ecn-robots: finalised host uname.

---
 vserver.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/vserver.py b/vserver.py
index 2878a21..6b09e4d 100644
--- a/vserver.py
+++ b/vserver.py
@@ -162,8 +162,6 @@ class Host(object):
     @property
     def info(self):
         information= {'kernel':'', 'uptime':'' }
-#        returncode, kernel = self.p.run([u'uname', u'-r'])
-#        information['kernel'] = kernel.strip()
         information['kernel'] = os.uname()[2]
         secs = math.ceil(float(self.p.read_binary(u'/proc/uptime').split()[1]))
         information['uptime'] = self.p.convert_human(secs)