diff options
author | Guido Guenther <agx@sigxcpu.org> | 2008-08-02 15:49:15 +0200 |
---|---|---|
committer | Guido Guenther <agx@sigxcpu.org> | 2008-08-02 15:49:15 +0200 |
commit | daf11b7cba633ee0422ce3099d8fd120ad17417f (patch) | |
tree | 02c148f0d9e8ff286786dc100c764f5f5a116890 /git-buildpackage | |
parent | 5a4c2058a872f11aed3101c065f93bf68db13cdd (diff) | |
parent | 11e1d9825367657bae6b537c5dd6daba0f48464f (diff) |
Merge commit 'debian/0.4.34' into bpo-etch
Conflicts:
debian/changelog
Diffstat (limited to 'git-buildpackage')
-rwxr-xr-x | git-buildpackage | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/git-buildpackage b/git-buildpackage index 60272d98..fc3feba5 100755 --- a/git-buildpackage +++ b/git-buildpackage @@ -164,7 +164,7 @@ def main(argv): parser.add_config_file_option(option_name="upstream-tag", dest="upstream_tag", help="format string for upstream tags, default is '%(upstream-tag)s'") parser.add_config_file_option(option_name="export-dir", dest="export_dir", - help="before building export into EXPORT_DIR") + help="before building export source into EXPORT_DIR, default is '%(export-dir)s'") parser.add_config_file_option(option_name="tarball-dir", dest="tarball_dir", help="location to look for external tarballs") parser.add_config_file_option(option_name="pristine-tar", dest="pristine_tar", @@ -241,10 +241,10 @@ def main(argv): # Get/build the orig.tar.gz if necessary: if not du.is_native(cp): - # first look up if we have a tarball at tarball_dir - if options.tarball_dir and not du.has_orig(cp, output_dir): - print "Looking for orig tarball '%s' from '%s'" % (du.orig_file(cp), tarball_dir) - if not du.copy_orig(cp, tarball_dir, output_dir): + # look in tarball_dir first, if it's there even replace an existing orig.tar.gz + 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): 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) |