diff options
author | Loïc Minier <lool@debian.org> | 2011-04-08 03:50:10 +0200 |
---|---|---|
committer | Guido Günther <agx@sigxcpu.org> | 2011-04-09 22:42:31 +0200 |
commit | 1919f2677e963a64cef2b62373f25d0cfab99e95 (patch) | |
tree | 24f642c978c94ff64a896625600fcf8d04143d68 /git-buildpackage | |
parent | abf76d0ad980f405f458d54051d0f75a847d25a7 (diff) |
Pass tarball_dir to guess_comp_type()
Git-Dch: Ignore
Diffstat (limited to 'git-buildpackage')
-rwxr-xr-x | git-buildpackage | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-buildpackage b/git-buildpackage index aa7d1ef5..11773ab0 100755 --- a/git-buildpackage +++ b/git-buildpackage @@ -263,7 +263,7 @@ def extract_orig(orig_tarball, dest_dir): os.rmdir(tar_topdir) -def guess_comp_type(repo, comp_type, cp): +def guess_comp_type(repo, comp_type, cp, tarball_dir): """Guess compression type""" srcpkg = cp['Source'] @@ -454,7 +454,8 @@ def main(argv): # Get/build the orig.tar.gz if necessary: if not du.is_native(cp): - options.comp_type = guess_comp_type(repo, options.comp_type, cp) + options.comp_type = guess_comp_type( + repo, options.comp_type, cp, options.tarball_dir) orig_file = du.orig_file(cp, options.comp_type) # look in tarball_dir first, if found force a symlink to it |