From 13de1438390977e17c2ea537ce0e876812dbefb2 Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@yahoo-inc.com>
Date: Fri, 20 Apr 2012 13:21:31 -0700
Subject: [PATCH] Fixed pyling warnings, made something that is already
 installed actually be skipped

---
 devstack/cfg_helpers.py |  1 -
 devstack/component.py   |  4 +---
 devstack/distro.py      |  1 -
 devstack/packager.py    | 15 ++++++++-------
 devstack/persona.py     |  1 -
 devstack/pip.py         |  2 --
 6 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/devstack/cfg_helpers.py b/devstack/cfg_helpers.py
index 78e79a6f..60fbd48c 100644
--- a/devstack/cfg_helpers.py
+++ b/devstack/cfg_helpers.py
@@ -15,7 +15,6 @@
 #    under the License.
 
 from devstack import log as logging
-from devstack import settings
 
 LOG = logging.getLogger("devstack.cfg.helpers")
 
diff --git a/devstack/component.py b/devstack/component.py
index e17d6463..82d3e596 100644
--- a/devstack/component.py
+++ b/devstack/component.py
@@ -20,8 +20,6 @@ from devstack import downloader as down
 from devstack import exceptions as excp
 from devstack import importer
 from devstack import log as logging
-from devstack import packager
-from devstack import pip
 from devstack import settings
 from devstack import shell as sh
 from devstack import trace as tr
@@ -469,7 +467,7 @@ class PythonUninstallComponent(PkgUninstallComponent):
                 for (i, p) in enumerate(pips):
                     try:
                         self.pip_factory.get_packager_for(p).remove(p)
-                    except excp.ProcessExecutionError as e:
+                    except excp.ProcessExecutionError:
                         # NOTE(harlowja): pip seems to die if a pkg isn't there even in quiet mode
                         pass
                     p_bar.update(i + 1)
diff --git a/devstack/distro.py b/devstack/distro.py
index 578db121..5a2b474a 100644
--- a/devstack/distro.py
+++ b/devstack/distro.py
@@ -22,7 +22,6 @@ import shlex
 
 import yaml
 
-from devstack import decorators
 from devstack import importer
 from devstack import log as logging
 from devstack import settings
diff --git a/devstack/packager.py b/devstack/packager.py
index b716b7fc..d13edd08 100644
--- a/devstack/packager.py
+++ b/devstack/packager.py
@@ -15,9 +15,7 @@
 #    under the License.
 
 import abc
-import collections
 
-from devstack import decorators
 from devstack import importer
 from devstack import log as logging
 from devstack import utils
@@ -43,10 +41,12 @@ class Packager(object):
     def install(self, pkg):
         name = pkg['name']
         version = pkg.get('version')
+        skip_install = False
         if name in self.registry.installed:
             existing_version = self.registry.installed[name]
             if version == existing_version:
                 LOG.debug("Skipping install of %r since it already happened.", name)
+                skip_install = True
             else:
                 if existing_version is not None:
                     if utils.versionize(existing_version) < utils.versionize(version):
@@ -55,11 +55,12 @@ class Packager(object):
                         LOG.warn("A request has come in for a older version of %r v(%s), when v(%s) was previously installed!", name, version, existing_version)
                 else:
                     LOG.warn("A request has come in for a different version of %r v(%s), when a unspecified version was previously installed!", name, version)
-        self._install(pkg)
-        LOG.debug("Noting that %r - v(%s) was installed.", name, (version or "??"))
-        self.registry.installed[name] = version
-        if name in self.registry.removed:
-            del(self.registry.removed[name])
+        if not skip_install:
+            self._install(pkg)
+            LOG.debug("Noting that %r - v(%s) was installed.", name, (version or "??"))
+            self.registry.installed[name] = version
+            if name in self.registry.removed:
+                del(self.registry.removed[name])
 
     def remove(self, pkg):
         removable = pkg.get('removable', True)
diff --git a/devstack/persona.py b/devstack/persona.py
index 74b9782a..10d2e862 100644
--- a/devstack/persona.py
+++ b/devstack/persona.py
@@ -16,7 +16,6 @@
 
 import yaml
 
-from devstack import decorators
 from devstack import exceptions as excp
 from devstack import log as logging
 from devstack import shell as sh
diff --git a/devstack/pip.py b/devstack/pip.py
index a1e75430..d7c5471a 100644
--- a/devstack/pip.py
+++ b/devstack/pip.py
@@ -15,10 +15,8 @@
 #    under the License.
 
 
-from devstack import exceptions as excp
 from devstack import log as logging
 from devstack import shell as sh
-from devstack import utils
 from devstack import packager as pack
 
 LOG = logging.getLogger("devstack.pip")