Package: git-buildpackage
Version: 0.4.39
Severity: normal
Tags: patch
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.
-- System Information:
Debian Release: lenny/sid
APT prefers unstable
APT policy: (900, 'unstable')
Architecture: i386 (i686)
Kernel: Linux 2.6.25-2-686 (SMP w/1 CPU core)
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Shell: /bin/sh linked to /bin/dash
Versions of packages git-buildpackage depends on:
ii devscripts 2.10.34 scripts to make the life of a Debi
ii git-core 1:1.5.6.5-1 fast, scalable, distributed revisi
ii python 2.5.2-1 An interactive high-level object-o
ii python-dateutil 1.4-1 powerful extensions to the standar
ii python-support 0.8.4 automated rebuilding support for P
git-buildpackage recommends no packages.
Versions of packages git-buildpackage suggests:
pn git-load-dirs <none> (no description available)
ii pristine-tar 0.17 regenerate pristine tarballs
-- no debconf information
>From 001b3a9d46212a9c2d4763cd1ecbaaf9fef12f97 Mon Sep 17 00:00:00 2001
From: Kurt B. Kaiser <[EMAIL PROTECTED]>
Date: Sat, 27 Sep 2008 18:20:10 -0400
Subject: [PATCH] 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.
---
git-buildpackage | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-buildpackage b/git-buildpackage
index 53fa72e..53231d0 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)
--
1.5.6.5
