diff options
| author | Monty Taylor <mordred@hudson> | 2010-07-14 22:04:27 +0000 |
|---|---|---|
| committer | Monty Taylor <mordred@hudson> | 2010-07-14 22:04:27 +0000 |
| commit | b41bb8cefa3a03e820375871e8411039f23f6b45 (patch) | |
| tree | 449b786dfa606e0e685ed4cc3e68815964d46734 | |
| parent | ea9b913ccceda5944c881f3ce9cadde39b0e0344 (diff) | |
Added build-deps to debian/control that are needed to run test suite.
Fixed an error in a test case.
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | nova/crypto.py | 2 |
2 files changed, 2 insertions, 2 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) |