On Sun, May 25, 2008 at 07:52:10AM -0700, Russ Allbery wrote:
> windlord:~/dvl/debian/xml-security-c> git-buildpackage --git-ignore-new
> Exporting 'HEAD' to '/home/eagle/dvl/debian/build-area/xml-security-c-tmp'
> Moving '/home/eagle/dvl/debian/build-area/xml-security-c-tmp' to
> '/home/eagle/dvl/debian/build-area/xml-security-c-1.4.0'
> Getting orig tarbball from ../tarballs/
> Cannot copy orig tarball from ../tarballs/
If you have tarball-dir it _expects_ to find a tarball there. If it
doesn't it fails at the moment. This is no nice behaviour - I changed
the code to try finding/building the upstream tarball harder except when
you really give --no-create-orig. Could you try this patch:
diff --git a/git-buildpackage b/git-buildpackage
index 7b278af..105d46d 100755
--- a/git-buildpackage
+++ b/git-buildpackage
@@ -237,13 +237,13 @@ def main(argv):
# Get/build the orig.tar.gz if necessary:
if not du.is_native(cp):
- if du.has_orig(cp, output_dir):
- pass
- elif options.tarball_dir: # separate tarball dir specified
- print "Getting orig tarbball from %s" % tarball_dir
+ # first look up if we have a tarball at tarball_dir
+ if options.tarball_dir and not du.has_oig(cp, output_dir):
+ print "Lookig for orig tarball 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 not options.no_create_orig:
+ print "Orig tarball not found at '%s'" % tarball_dir
+ # build an orig unless the user forbidds it
+ if not options.no_create_orig and not du.has_orig(cp, output_dir):
if not pristine_tar_build_orig(repo, cp, output_dir, options):
git_archive_build_orig(repo, cp, output_dir, options)
--
1.5.5.1
-- Guido
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
