From 4dafefc08197a9ce65765b6f91bcbc0e3980b36d Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Thu, 26 Jan 2012 12:23:43 -0800 Subject: [PATCH] Clean this up a little. --- devstack/packaging/apt.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/devstack/packaging/apt.py b/devstack/packaging/apt.py index e0565049..13e850bb 100644 --- a/devstack/packaging/apt.py +++ b/devstack/packaging/apt.py @@ -43,16 +43,14 @@ VERSION_TEMPL = "%s=%s" class AptPackager(pack.Packager): def __init__(self, distro): pack.Packager.__init__(self, distro) - - def _format_version(self, name, version): - return VERSION_TEMPL % (name, version) + self.auto_remove = True def _format_pkg(self, name, version): - if version and len(version): - cmd = self._format_version(name, version) + if version: + pkg_full_name = VERSION_TEMPL % (name, version) else: - cmd = name - return cmd + pkg_full_name = name + return pkg_full_name def _execute_apt(self, cmd, **kargs): return sh.execute(*cmd, run_as_root=True, @@ -80,9 +78,10 @@ class AptPackager(pack.Packager): if cmds: cmd = APT_GET + APT_DO_REMOVE + cmds self._execute_apt(cmd) - #clean them out - cmd = APT_GET + APT_AUTOREMOVE - self._execute_apt(cmd) + #clean them out (if we did anything) + if which_removed and self.auto_remove: + cmd = APT_GET + APT_AUTOREMOVE + self._execute_apt(cmd) return which_removed def install_batch(self, pkgs):