Adam Litke has uploaded a new change for review.
Change subject: caps: Ensure package version data are always strings
......................................................................
caps: Ensure package version data are always strings
According to the schema, package version information is always returned in
string form. Make sure this is the case.
Change-Id: I506d2b5edacd85c5540a040ce0ff5fe40c12b352
Signed-off-by: Adam Litke <a...@us.ibm.com>
---
M vdsm/caps.py
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/69/11569/1
diff --git a/vdsm/caps.py b/vdsm/caps.py
index a307200..d719672 100644
--- a/vdsm/caps.py
+++ b/vdsm/caps.py
@@ -320,7 +320,7 @@
try:
t = file('/proc/sys/kernel/version').read().split()[2:]
del t[4] # Delete timezone
- t = time.mktime(time.strptime(' '.join(t)))
+ t = str(time.mktime(time.strptime(' '.join(t))))
except:
logging.error('kernel build time not found', exc_info=True)
t = '0'
@@ -342,9 +342,9 @@
logging.debug("rpm package %s not found", pkg)
else:
pkgs[pkg] = {
- 'version': mi['version'],
- 'release': mi['release'],
- 'buildtime': mi['buildtime'],
+ 'version': str(mi['version']),
+ 'release': str(mi['release']),
+ 'buildtime': str(mi['buildtime']),
}
except:
logging.error('', exc_info=True)
@@ -359,7 +359,7 @@
for pkg in KEY_PACKAGES:
try:
deb_pkg = KEY_PACKAGES[pkg]
- ver = cache[deb_pkg].installed.version
+ ver = str(cache[deb_pkg].installed.version)
# Debian just offers a version
pkgs[pkg] = dict(version=ver, release="", buildtime="")
except:
--
To view, visit http://gerrit.ovirt.org/11569
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I506d2b5edacd85c5540a040ce0ff5fe40c12b352
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke <a...@us.ibm.com>
_______________________________________________
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
