diff options
| author | Justin Santa Barbara <justin@fathomdb.com> | 2011-03-24 01:05:13 -0700 |
|---|---|---|
| committer | Justin Santa Barbara <justin@fathomdb.com> | 2011-03-24 01:05:13 -0700 |
| commit | 143a8387fcbec34fd919e322a3fed7e9505c8a7c (patch) | |
| tree | 347dc908b9da81008cff98310211fcef59566075 /nova/crypto.py | |
| parent | 1894937e1ef6769a5f76c0a382931480e2547ce8 (diff) | |
| parent | 86b3cc94bc672fda7925a247c3b7c2f85be2c5b5 (diff) | |
Merged with trunk
Diffstat (limited to 'nova/crypto.py')
| -rw-r--r-- | nova/crypto.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/crypto.py b/nova/crypto.py index 2a8d4abca..b112e5b92 100644 --- a/nova/crypto.py +++ b/nova/crypto.py @@ -26,6 +26,7 @@ import gettext import hashlib import os import shutil +import string import struct import tempfile import time @@ -267,7 +268,7 @@ def _sign_csr(csr_text, ca_folder): './openssl.cnf', '-infiles', inbound) out, _err = utils.execute('openssl', 'x509', '-in', outbound, '-serial', '-noout') - serial = out.rpartition("=")[2] + serial = string.strip(out.rpartition("=")[2]) os.chdir(start) with open(outbound, "r") as crtfile: return (serial, crtfile.read()) |