diff options
| author | Rob Austein <sra@hactrn.net> | 2014-04-02 19:19:24 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2014-04-02 19:19:24 +0000 |
| commit | 6ff1b7c0a53e3110595dda6847187c48d550c803 (patch) | |
| tree | fdf0d090e7965d3980cd70fc02ac463ad728c69e | |
| parent | c957eeb23d74dd88b1ece66f1417dca3ecdfe395 (diff) | |
Don't try to batch revocations.
svn path=/branches/tk671/; revision=5737
| -rw-r--r-- | rpkid/upgrade-scripts/upgrade-irdbd-to-0.5678.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/rpkid/upgrade-scripts/upgrade-irdbd-to-0.5678.py b/rpkid/upgrade-scripts/upgrade-irdbd-to-0.5678.py index 5d98b90b..b9a4111c 100644 --- a/rpkid/upgrade-scripts/upgrade-irdbd-to-0.5678.py +++ b/rpkid/upgrade-scripts/upgrade-irdbd-to-0.5678.py @@ -87,10 +87,13 @@ subprocess.check_call(argv) time.sleep(5) -argv = [irbe_cli] +# Revoke can return failure when certificate being revoked has already +# been withdrawn for other reasons. This is harmless, except that it +# causes batch mode irbe_cli to blow out without processing any other +# revocations. So we don't try to batch revocations. + for handle in handles: - argv.extend(("self", "--self_handle", handle, "--action", "set", "--revoke")) -subprocess.check_call(argv) + subprocess.check_call((irbe_cli, "self", "--self_handle", handle, "--action", "set", "--revoke")) deletions = [] for top, dirs, files in os.walk(os.path.join(rpki.autoconf.datarootdir, "rpki", "publication")): |