aboutsummaryrefslogtreecommitdiff
path: root/rpkid/testbed.py
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2009-07-31 13:24:47 +0000
committerRob Austein <sra@hactrn.net>2009-07-31 13:24:47 +0000
commitfb9d4d2ddf7a6638d9cc896b125c9e065f160511 (patch)
tree6bc14754c7c8a4f11060b83830fe9e2a808c7d35 /rpkid/testbed.py
parentc467f935057d9b141a626c9d5c5b377dc0ff4c38 (diff)
Several little portability fixes
svn path=/rpkid/rpki/https.py; revision=2683
Diffstat (limited to 'rpkid/testbed.py')
-rw-r--r--rpkid/testbed.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/rpkid/testbed.py b/rpkid/testbed.py
index 0b259333..92902a69 100644
--- a/rpkid/testbed.py
+++ b/rpkid/testbed.py
@@ -285,7 +285,7 @@ def main():
except:
rpki.log.info("Event loop exited with an exception")
- raise
+ rpki.log.traceback()
finally:
@@ -1417,7 +1417,7 @@ rootd_fmt_3 = '''\
%(openssl)s req -new -sha256 -key %(rootd_name)s.key -out %(rootd_name)s.req -config %(rootd_name)s.conf -text -extensions req_x509_rpki_ext &&
%(openssl)s x509 -req -sha256 -in %(rootd_name)s.req -out %(rootd_name)s.cer -outform DER -extfile %(rootd_name)s.conf -extensions req_x509_rpki_ext \
-signkey %(rootd_name)s.key &&
-ln -f %(rootd_name)s.cer %(rsyncd_dir)s &&
+ln -f %(rootd_name)s.cer %(rsyncd_dir)s
'''
rcynic_fmt_1 = '''\