Merge branch 'develop' of https://github.com/nicolargo/glances into develop

This commit is contained in:
Nicolargo 2015-11-27 10:54:15 +01:00
commit 18d15f7a4c
2 changed files with 2 additions and 2 deletions

View File

@ -116,7 +116,7 @@ class Plugin(GlancesPlugin):
else:
self.stats['linux_distro'] = ' '.join(linux_distro[:2])
self.stats['os_version'] = platform.release()
elif self.stats['os_name'] in ('FreeBSD', 'OpenBSD'):
elif self.stats['os_name'].endswith('BSD'):
self.stats['os_version'] = platform.release()
elif self.stats['os_name'] == "Darwin":
self.stats['os_version'] = platform.mac_ver()[0]

View File

@ -1 +1 @@
psutil==3.2.2
psutil==3.3.0