aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2014-10-03 03:43:06 +0000
committerRob Austein <sra@hactrn.net>2014-10-03 03:43:06 +0000
commit21290c958558f4cac875fa52b30ea0d3704cb587 (patch)
tree702d1556a0c780924617d18f1b1f4f29e551849c
parent06c7c5d779631e43772743ea9dbe8a82949bf23b (diff)
Pull from trunk.
svn path=/branches/tk705/; revision=5984
-rw-r--r--buildtools/rpki-pbuilder.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/buildtools/rpki-pbuilder.py b/buildtools/rpki-pbuilder.py
index 8888a826..5043c60e 100644
--- a/buildtools/rpki-pbuilder.py
+++ b/buildtools/rpki-pbuilder.py
@@ -102,6 +102,7 @@ if not source_version.isdigit() and not args.debug:
sys.exit("Sources don't look pristine, not building (%r)" % source_version)
source_version = "0." + source_version
+search_version = "_" + source_version + "~"
dsc_dir = os.path.abspath(os.path.join(args.svn_tree, ".."))
@@ -196,7 +197,7 @@ class Release(object):
if not os.path.exists(self.dsc):
logging.info("Building source package %s", self.version)
for fn in os.listdir(dsc_dir):
- if fn != "trunk":
+ if fn != "trunk" and search_version not in fn:
os.unlink(os.path.join(dsc_dir, fn))
run("rm", "-rf", "debian", cwd = args.svn_tree)
run(sys.executable, "buildtools/make-version.py", cwd = args.svn_tree)