And this time it ran perfectly on the first pass. Yep, some kind of timing thing.

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

1 files changed, 13 insertions, 16 deletions

diff --git a/rpkid/upgrade-scripts/upgrade-irdbd-to-0.5678.py b/rpkid/upgrade-scripts/upgrade-irdbd-to-0.5678.py
index 3889ea90..d381995b 100644
--- a/rpkid/upgrade-scripts/upgrade-irdbd-to-0.5678.py
+++ b/rpkid/upgrade-scripts/upgrade-irdbd-to-0.5678.py
@@ -39,30 +39,27 @@ import os.path
 import subprocess
 import rpki.autoconf
 
+time.sleep(10)
+
 rpkic = os.path.join(rpki.autoconf.sbindir, "rpkic")
 
 handles = subprocess.check_output((rpkic, "list_self_handles")).splitlines()
 
-for i in (1, 2):
-
-  print "Pass #%d" % i 
-  time.sleep(10)
+for handle in handles:
 
-  for h in handles:
+  print "Processing", handle
 
-    print "Processing", h
+  print "Asking parent to reissue with new key"
+  subprocess.check_call((rpkic, "-i", handle, "up_down_rekey"))
 
-    print "Asking parent to reissue with new key"
-    subprocess.check_call((rpkic, "-i", h, "up_down_rekey"))
-
-    print "Asking parent to revoke old key"
-    subprocess.check_call((rpkic, "-i", h, "up_down_revoke"))
-    time.sleep(10)
+  print "Asking parent to revoke old key"
+  subprocess.check_call((rpkic, "-i", handle, "up_down_revoke"))
+  time.sleep(10)
 
-    print "Reissuing everything"
-    subprocess.check_call((rpkic, "-i", h, "force_reissue"))
+  print "Reissuing everything"
+  subprocess.check_call((rpkic, "-i", handle, "force_reissue"))
 
-    print "Forcing publication"
-    subprocess.check_call((rpkic, "-i", h, "force_publication"))
+  print "Forcing publication"
+  subprocess.check_call((rpkic, "-i", handle, "force_publication"))
 
 ''')