From c957eeb23d74dd88b1ece66f1417dca3ecdfe395 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Wed, 2 Apr 2014 19:12:20 +0000 Subject: Hmm, Python "exec" is a bit fragile, may need to do something about constructing script-specific symbol table. svn path=/branches/tk671/; revision=5736 --- rpkid/upgrade-scripts/upgrade-irdbd-to-0.5678.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'rpkid/upgrade-scripts/upgrade-irdbd-to-0.5678.py') diff --git a/rpkid/upgrade-scripts/upgrade-irdbd-to-0.5678.py b/rpkid/upgrade-scripts/upgrade-irdbd-to-0.5678.py index d100553f..5d98b90b 100644 --- a/rpkid/upgrade-scripts/upgrade-irdbd-to-0.5678.py +++ b/rpkid/upgrade-scripts/upgrade-irdbd-to-0.5678.py @@ -93,8 +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 top, dirs, files in os.walk(os.path.join(rpki.autoconf.datarootdir, "rpki", "publication")): + deletions.extend(os.path.join(top, d) for d in dirs if d.isdigit()) for d in deletions: shutil.rmtree(d, ignore_errors = True) -- cgit v1.2.3