Your message dated Wed, 7 May 2008 00:20:33 +0200 with message-id <[EMAIL PROTECTED]> and subject line Re: Bug#479844: git-buildpackage: Not finding tarball downloaded by uscan has caused the Debian Bug report #479844, regarding git-buildpackage: Not finding tarball downloaded by uscan to be marked as done.
This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact [EMAIL PROTECTED] immediately.) -- 479844: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=479844 Debian Bug Tracking System Contact [EMAIL PROTECTED] with problems
--- Begin Message ---Package: git-buildpackage Version: 0.4.27 Severity: normal Tags: patch bit-bp isn't looking in the repo's parent directory for the tarball which is downloaded by uscan. It then proceeds to rebuild the tarball, which cause the md5sum to differ from pristine. Patch to add a clause to git-buildpackage to check the parent directory before rebuilding the tarball. -- System Information: Debian Release: lenny/sid APT prefers unstable APT policy: (900, 'unstable') Architecture: i386 (i686) Kernel: Linux 2.6.24-1-686 (SMP w/1 CPU core) Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968) Shell: /bin/sh linked to /bin/bash Versions of packages git-buildpackage depends on: ii devscripts 2.10.27 scripts to make the life of a Debi ii git-core 1:1.5.5.1-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.7.7 automated rebuilding support for P git-buildpackage recommends no packages. -- no debconf information *** /home/kbk/Packages/Git-upstream/git-buildpackage/0001-Copy-tarball-from-location-where-uscan-leaves-it.patch >From 49697335d203b39efe043ad903df8bf15ddae6f0 Mon Sep 17 00:00:00 2001 From: Kurt B. Kaiser <[EMAIL PROTECTED]> Date: Tue, 6 May 2008 00:44:18 -0400 Subject: [PATCH] Copy tarball from location where uscan leaves it. --- git-buildpackage | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/git-buildpackage b/git-buildpackage index 62c9653..f80e06b 100755 --- a/git-buildpackage +++ b/git-buildpackage @@ -235,13 +235,19 @@ def main(argv): # Get/build the orig.tar.gz if necessary: if not du.is_native(cp): + parent_dir = os.path.dirname(repo_dir) if du.has_orig(cp, output_dir): pass elif options.tarball_dir: # separate tarball dir specified print "Getting orig tarbball from %s" % tarball_dir if not du.copy_orig(cp, tarball_dir, output_dir): raise GbpError, "Cannot copy orig tarball from %s" % tarball_dir + elif du.has_orig(cp, parent_dir): + print "Getting orig tarball from %s" % parent_dir + if not du.copy_orig(cp, parent_dir, output_dir): + raise GbpError, "Cannot copy orig tarball from %s" % parent_dir elif not options.no_create_orig: + print "Building tarball from repository..." if not pristine_tar_build_orig(repo, cp, output_dir, options): git_archive_build_orig(repo, cp, output_dir, options) -- 1.5.5.1
--- End Message ---
--- Begin Message ---On Tue, May 06, 2008 at 05:56:40PM -0400, Kurt B. Kaiser wrote: > Patch to add a clause to git-buildpackage to check the parent directory > before rebuilding the tarball. It certainly looks in the output dir: > # Get/build the orig.tar.gz if necessary: > if not du.is_native(cp): > + parent_dir = os.path.dirname(repo_dir) > if du.has_orig(cp, output_dir): ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ If you want to have it somewhere else let uscan put it there - there's no point in letting git-buildpackage start guessing. Cheers, -- Guido
--- End Message ---
