diff options
-rw-r--r-- | update.py | 14 | ||||
-rwxr-xr-x | update.sh | 13 |
2 files changed, 17 insertions, 10 deletions
@@ -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', diff --git a/update.sh b/update.sh new file mode 100755 index 0000000..37d4a02 --- /dev/null +++ b/update.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +# Make some coffee and read https://code.launchpad.net/bugs/951197 + +VENV=.update-venv + +[ -d $VENV ] || virtualenv -q --no-site-packages $VENV + +. $VENV/bin/activate + +python setup.py install + +python update.py $* |