summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorKurt B. Kaiser <kbk@shore.net>2008-09-27 18:20:10 -0400
committerGuido Guenther <agx@sigxcpu.org>2008-10-02 12:25:14 +0200
commitbbd9946d244699ecd9dafa54d91d55d4a48ccb66 (patch)
treebcb66925f5c87f6b6377ee1d1984b9fdebadb74b
parent33329823c89d22f1311246fa536ba1dd252a8b2a (diff)
Force tarball symlink on second export to build-area
When exporting to a separate build area for the second time, g-bp can't recreate the symlink and therefore complains that the tarball wasn't found. Force the symlink to resolve this. Closes: #500498
-rwxr-xr-xgit-buildpackage4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-buildpackage b/git-buildpackage
index 53fa72e9..53231d02 100755
--- a/git-buildpackage
+++ b/git-buildpackage
@@ -241,10 +241,10 @@ def main(argv):
# Get/build the orig.tar.gz if necessary:
if not du.is_native(cp):
- # look in tarball_dir first, if it's there even replace an existing orig.tar.gz
+ # look in tarball_dir first, if found force a symlink to it
if options.tarball_dir:
print "Looking for orig tarball '%s' at '%s'" % (du.orig_file(cp), tarball_dir)
- if not du.symlink_orig(cp, tarball_dir, output_dir):
+ if not du.symlink_orig(cp, tarball_dir, output_dir, force=True):
print "Orig tarball '%s' not found at '%s'" % (du.orig_file(cp), tarball_dir)
else:
print "Orig tarball '%s' found at '%s'" % (du.orig_file(cp), tarball_dir)