From: Andrew Schoen Date: Fri, 28 Aug 2015 20:07:18 +0000 (-0500) Subject: packaging: only mangle the version string for the ceph project X-Git-Tag: 1.1.0~838^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=213f8aceaebfd7ca21efcf211490e08db34d6cef;p=teuthology.git packaging: only mangle the version string for the ceph project This parsing is not needed on other projects and it was breaking the kernel task by trying to verify an incorrect version was installed. Signed-off-by: Andrew Schoen --- diff --git a/teuthology/packaging.py b/teuthology/packaging.py index 04eaae1c5..529835687 100644 --- a/teuthology/packaging.py +++ b/teuthology/packaging.py @@ -675,15 +675,15 @@ class GitbuilderProject(object): ) else: version = resp.text.strip() - # TODO: move this parsing into a different function for - # easier testing - # FIXME: 'version' as retreived from the repo is actually the - # RPM version PLUS *part* of the release. Example: - # Right now, ceph master is given the following version in the - # repo file: v0.67-rc3.164.gd5aa3a9 - whereas in reality the RPM - # version is 0.61.7 and the release is 37.g1243c97.el6 (centos6). - # Point being, I have to mangle a little here. - if self.pkg_type == "rpm": + if self.pkg_type == "rpm" and self.project == "ceph": + # TODO: move this parsing into a different function for + # easier testing + # FIXME: 'version' as retreived from the repo is actually the + # RPM version PLUS *part* of the release. Example: + # Right now, ceph master is given the following version in the + # repo file: v0.67-rc3.164.gd5aa3a9 - whereas in reality the RPM + # version is 0.61.7 and the release is 37.g1243c97.el6 (centos6). + # Point being, I have to mangle a little here. if version[0] == 'v': version = version[1:] if '-' in version: