diff options
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | nova/crypto.py | 2 | ||||
| -rw-r--r-- | nova/tests/objectstore_unittest.py | 9 |
3 files changed, 8 insertions, 5 deletions
diff --git a/debian/control b/debian/control index a50e6ecf8..ebb8db3d0 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: nova Section: net Priority: extra Maintainer: Jesse Andrews <jesse@ansolabs.com> -Build-Depends: debhelper (>= 7) +Build-Depends: debhelper (>= 7), nettle-bin, redis-server (>=2:2.0.0~rc1), python-m2crypto, lsh-utils Build-Depends-Indep: python-support Standards-Version: 3.8.4 XS-Python-Version: 2.6 diff --git a/nova/crypto.py b/nova/crypto.py index 80b4ef9de..114143baf 100644 --- a/nova/crypto.py +++ b/nova/crypto.py @@ -92,7 +92,7 @@ def ssl_pub_to_ssh_pub(ssl_public_key, name='root', suffix='nova'): + " transport | lsh-export-key --openssh" (out, err) = utils.execute(convert, ssl_public_key) if err: - raise exception.Error("Failed to generate key: %s", err) + raise exception.Error("Failed to generate key: %s" % err) return '%s %s@%s\n' %(out.strip(), name, suffix) diff --git a/nova/tests/objectstore_unittest.py b/nova/tests/objectstore_unittest.py index 89c1d59c5..17946bb2c 100644 --- a/nova/tests/objectstore_unittest.py +++ b/nova/tests/objectstore_unittest.py @@ -41,9 +41,12 @@ oss_tempdir = tempfile.mkdtemp(prefix='test_oss-') # delete tempdirs from previous runs (we don't delete after test to allow # checking the contents after running tests) -for path in glob.glob(os.path.abspath(os.path.join(oss_tempdir, '../test_oss-*'))): - if path != oss_tempdir: - shutil.rmtree(path) +# TODO: This fails on the test box with a permission denied error +# Also, doing these things in a global tempdir means that different runs of +# the test suite on the same box could clobber each other. +#for path in glob.glob(os.path.abspath(os.path.join(oss_tempdir, '../test_oss-*'))): +# if path != oss_tempdir: +# shutil.rmtree(path) # create bucket/images path |