diff options
| author | Rob Austein <sra@hactrn.net> | 2007-07-19 19:46:38 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2007-07-19 19:46:38 +0000 |
| commit | e185041e5c49d271222ce700dad84557a3b949a5 (patch) | |
| tree | ff3419885b61c9f5cf92d83f7052d5e53fce1d9a /scripts/rpki | |
| parent | 05397773a22a18d974c78ca94aac12fe7eb3a57a (diff) | |
Bugfix
svn path=/scripts/Makefile; revision=780
Diffstat (limited to 'scripts/rpki')
| -rw-r--r-- | scripts/rpki/left_right.py | 2 | ||||
| -rw-r--r-- | scripts/rpki/relaxng.py | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/scripts/rpki/left_right.py b/scripts/rpki/left_right.py index c19cdc45..9e345556 100644 --- a/scripts/rpki/left_right.py +++ b/scripts/rpki/left_right.py @@ -120,7 +120,7 @@ class bsc_elt(base_elt): class parent_elt(base_elt): - attributes = ("self_id", "parent_id", "bsc_link", "repository_link", "peer_contact", "sia_base") + attributes = ("action", "self_id", "parent_id", "bsc_link", "repository_link", "peer_contact", "sia_base") booleans = ("rekey", "reissue", "revoke") peer_ta = None diff --git a/scripts/rpki/relaxng.py b/scripts/rpki/relaxng.py index a4a6c00d..072d7798 100644 --- a/scripts/rpki/relaxng.py +++ b/scripts/rpki/relaxng.py @@ -7,6 +7,13 @@ def relaxng(xml, rng): Validate a chunk of xml against a RelaxNG schema. """ + # We could use either xmllint or jing here, but xmllint is easier. + # How to invoke jing, just in case: + # + # java -jar /usr/local/share/java/classes/jing.jar schema.rng foo.xml + # + # If error messages from xmllint are incomprehensible, try jing too. + i, o = os.popen4(("xmllint", "--noout", "--relaxng", rng, "-")) i.write(xml) i.close() |