summaryrefslogtreecommitdiffstats
path: root/update.py
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2012-06-29 18:22:29 +0100
committerMark McLoughlin <markmc@redhat.com>2012-06-29 18:25:52 +0100
commit7d82ec7308a416358e7ac587431d6c4a5d865970 (patch)
tree6b0419d25ac0f63bdc3e19a3d12c729fc38348fb /update.py
parentae2c6f0c93a1c1bdb2dd503978ef912547114f55 (diff)
downloadoslo-7d82ec7308a416358e7ac587431d6c4a5d865970.tar.gz
oslo-7d82ec7308a416358e7ac587431d6c4a5d865970.tar.xz
oslo-7d82ec7308a416358e7ac587431d6c4a5d865970.zip
Add update.sh to avoid import conflicts
Attempts to fix #951197 The openstack nose plugin defines the openstack.common namespace which can result in exceptions when update.py attempts to import cfg. Avoid the issue by using an update.sh script which creates a no-site-packages virtualenv. Change-Id: I1ec5cf49361303b79306714122b860f6e4912215
Diffstat (limited to 'update.py')
-rw-r--r--update.py14
1 files changed, 4 insertions, 10 deletions
diff --git a/update.py b/update.py
index 509f5ab..e69c56a 100644
--- a/update.py
+++ b/update.py
@@ -63,16 +63,10 @@ import shutil
import sys
try:
- from openstack import common
- cfg = common.cfg
-except AttributeError:
- # NOTE(jkoelker) Workaround for LP951197
- try:
- f, path, description = imp.find_module('openstack/common/cfg')
- cfg = imp.load_module('cfg', f, path, description)
- finally:
- if f is not None:
- f.close()
+ from openstack.common import cfg
+except:
+ sys.stderr.write("Try running update.sh")
+ raise
opts = [
cfg.ListOpt('modules',