x/anvil
Code Issues Proposed changes

Update devstack/packaging/yum.py

Browse Source
This commit is contained in:
Joshua Harlow 2012-02-08 22:48:43 -08:00
parent 010506d2b3
commit c54774871a
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/packaging/yum.py
View File

@ -32,6 +32,7 @@ YUM_REMOVE = ['erase', '-y', "-t"]
VERSION_TEMPL = "%s-%s" VERSION_TEMPL = "%s-%s"
#need to relink for rhel (not a bug!) #need to relink for rhel (not a bug!)
#TODO: maybe this should be a subclass that handles these differences
RHEL_RELINKS = { RHEL_RELINKS = {
'python-webob1.0': { 'python-webob1.0': {
"src": '/usr/lib/python2.6/site-packages/WebOb-1.0.8-py2.6.egg/webob/', "src": '/usr/lib/python2.6/site-packages/WebOb-1.0.8-py2.6.egg/webob/',
@ -60,12 +61,14 @@ class YumPackager(pack.Packager):
**kargs) **kargs)
def _remove_special(self, pkgname, pkginfo): def _remove_special(self, pkgname, pkginfo):
#TODO: maybe this should be a subclass that handles these differences
if self.distro == settings.RHEL6 and pkgname in RHEL_RELINKS: if self.distro == settings.RHEL6 and pkgname in RHEL_RELINKS:
#we don't return true here so that #we don't return true here so that
#the normal package cleanup happens #the normal package cleanup happens
sh.unlink(RHEL_RELINKS.get(pkgname).get("tgt")) sh.unlink(RHEL_RELINKS.get(pkgname).get("tgt"))
return False return False
#TODO: maybe this should be a subclass that handles these differences
def _install_rhel_relinks(self, pkgname, pkginfo): def _install_rhel_relinks(self, pkgname, pkginfo):
full_pkg_name = self._format_pkg_name(pkgname, pkginfo.get("version")) full_pkg_name = self._format_pkg_name(pkgname, pkginfo.get("version"))
install_cmd = YUM_CMD + YUM_INSTALL + [full_pkg_name] install_cmd = YUM_CMD + YUM_INSTALL + [full_pkg_name]
@ -79,6 +82,7 @@ class YumPackager(pack.Packager):
sh.symlink(src, tgt) sh.symlink(src, tgt)
return True return True
#TODO: maybe this should be a subclass that handles these differences
def _install_special(self, pkgname, pkginfo): def _install_special(self, pkgname, pkginfo):
if self.distro == settings.RHEL6 and pkgname in RHEL_RELINKS: if self.distro == settings.RHEL6 and pkgname in RHEL_RELINKS:
return self._install_rhel_relinks(pkgname, pkginfo) return self._install_rhel_relinks(pkgname, pkginfo)