Hmm, fun failures withdrawing nonexistent objects. Try postponing

revokcation until after we've done everything else.

svn path=/branches/tk671/; revision=5731

1 files changed, 7 insertions, 4 deletions

diff --git a/rpkid/upgrade-scripts/upgrade-irdbd-to-0.5678.py b/rpkid/upgrade-scripts/upgrade-irdbd-to-0.5678.py
index 81fe4701..ad9cf370 100644
--- a/rpkid/upgrade-scripts/upgrade-irdbd-to-0.5678.py
+++ b/rpkid/upgrade-scripts/upgrade-irdbd-to-0.5678.py
@@ -48,16 +48,19 @@ handles = subprocess.check_output((rpkic, "list_self_handles")).splitlines()
 
 argv = [irbe_cli]
 for handle in handles:
-  argv.extend(("self", "--self_handle", handle, "--action", "set",
-               "--rekey", "--reissue", "--run_now"))
+  argv.extend(("self", "--self_handle", handle, "--action", "set", "--rekey"))
 subprocess.check_call(argv)
 
 time.sleep(10)
 
 argv = [irbe_cli]
 for handle in handles:
-  argv.extend(("self", "--self_handle", handle, "--action", "set",
-               "--revoke", "--reissue", "--run_now", "--publish_world_now"))
+  argv.extend(("self", "--self_handle", handle, "--action", "set", "--reissue", "--run_now", "--publish_world_now"))
+subprocess.check_call(argv)
+
+argv = [irbe_cli]
+for handle in handles:
+  argv.extend(("self", "--self_handle", handle, "--action", "set", "--revoke"))
 subprocess.check_call(argv)
 
 ''')