From 7fe682f3bdde3797a4e454b18f147998a4f0238e Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Wed, 2 Apr 2014 17:12:20 +0000 Subject: Directory cleanup working as expected, but AIA cleanup still flakey. svn path=/branches/tk671/; revision=5735 --- rpkid/upgrade-scripts/upgrade-irdbd-to-0.5678.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'rpkid/upgrade-scripts') diff --git a/rpkid/upgrade-scripts/upgrade-irdbd-to-0.5678.py b/rpkid/upgrade-scripts/upgrade-irdbd-to-0.5678.py index c074ed94..d100553f 100644 --- a/rpkid/upgrade-scripts/upgrade-irdbd-to-0.5678.py +++ b/rpkid/upgrade-scripts/upgrade-irdbd-to-0.5678.py @@ -80,8 +80,12 @@ time.sleep(10) argv = [irbe_cli] for handle in handles: - argv.extend(("self", "--self_handle", handle, "--action", "set", "--reissue", "--run_now", "--publish_world_now")) + argv.extend(("self", "--self_handle", handle, "--action", "set", "--reissue")) +# Run this twice subprocess.check_call(argv) +subprocess.check_call(argv) + +time.sleep(5) argv = [irbe_cli] for handle in handles: @@ -89,10 +93,8 @@ for handle in handles: subprocess.check_call(argv) deletions = [] - for root, dirs, files in os.walk(os.path.join(rpki.autoconf.datarootdir, "rpki", "publication")): deletions.extend(os.path.join(root, d) for d in dirs if d.isdigit()) - for d in deletions: shutil.rmtree(d, ignore_errors = True) -- cgit v1.2.3