aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2014-04-02 19:12:20 +0000
committerRob Austein <sra@hactrn.net>2014-04-02 19:12:20 +0000
commitc957eeb23d74dd88b1ece66f1417dca3ecdfe395 (patch)
tree7a9d799d079fa2bb163f4c166cc9b482d0613960
parent7fe682f3bdde3797a4e454b18f147998a4f0238e (diff)
Hmm, Python "exec" is a bit fragile, may need to do something about
constructing script-specific symbol table. svn path=/branches/tk671/; revision=5736
-rw-r--r--rpkid/upgrade-scripts/upgrade-irdbd-to-0.5678.py4
1 files changed, 2 insertions, 2 deletions
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)