Update guess_comp_type to take a cp as param

Git-Dch: Ignore

1 files changed, 5 insertions, 2 deletions

diff --git a/git-buildpackage b/git-buildpackage
index 6223213a..aa7d1ef5 100755
--- a/git-buildpackage
+++ b/git-buildpackage
@@ -263,9 +263,12 @@ def extract_orig(orig_tarball, dest_dir):
         os.rmdir(tar_topdir)
 
 
-def guess_comp_type(repo, comp_type, srcpkg, upstream_version):
+def guess_comp_type(repo, comp_type, cp):
     """Guess compression type"""
 
+    srcpkg = cp['Source']
+    upstream_version = cp['Upstream-Version']
+
     if comp_type != 'auto':
         try:
             dummy = du.compressor_opts[comp_type]
@@ -451,7 +454,7 @@ 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['Source'], major)
+                options.comp_type = guess_comp_type(repo, options.comp_type, cp)
                 orig_file = du.orig_file(cp, options.comp_type)
 
                 # look in tarball_dir first, if found force a symlink to it