Browse Source

Merge branch 'master' of ssh://git.opensde.net/srv/git/users/karasz/ecn-robots

master
Nagy Karoly Gabriel 14 years ago
parent
commit
8d302b6982
1 changed files with 1 additions and 2 deletions
  1. +1
    -2
      vserver.py

+ 1
- 2
vserver.py

@ -162,8 +162,7 @@ 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)
return information

Loading…
Cancel
Save