aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2010-03-23 02:24:50 +0000
committerRob Austein <sra@hactrn.net>2010-03-23 02:24:50 +0000
commit831b35b6e5ff5e087341ab35fb5aa473fb935032 (patch)
treeddea34f6b470220e989a52f6976fc6ef26eed68f
parent8ebe69ce649455c1c15702a8f36e418f0a77f85e (diff)
Doh, report_error_elt is not XML
svn path=/myrpki.rototill/myrpki.py; revision=3130
-rw-r--r--myrpki.rototill/myrpki.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/myrpki.rototill/myrpki.py b/myrpki.rototill/myrpki.py
index 55ecfc4d..1a45370f 100644
--- a/myrpki.rototill/myrpki.py
+++ b/myrpki.rototill/myrpki.py
@@ -1636,9 +1636,9 @@ class main(rpki.cli.Cmd):
for r in rpkid_reply:
if isinstance(r, rpki.left_right.report_error_elt):
failed = True
- print "rpkid reported failure:"
- # Probably ought to do something kinder than dumping raw XML, later.
- print lxml.etree.tostring(r, pretty_print = True, encoding = "us-ascii")
+ print "rpkid reported failure:", r.error_code
+ if r.error_text:
+ print r.error_text
if failed:
raise RuntimeError
@@ -1649,9 +1649,9 @@ class main(rpki.cli.Cmd):
for r in pubd_reply:
if isinstance(r, rpki.publication.report_error_elt):
failed = True
- print "pubd reported failure:"
- # Probably ought to do something kinder than dumping raw XML, later.
- print lxml.etree.tostring(r, pretty_print = True, encoding = "us-ascii")
+ print "pubd reported failure:", r.error_code
+ if r.error_text:
+ print r.error_text
if failed:
raise RuntimeError