support import of tar.bz2 in git-import-orig

3 files changed, 24 insertions, 20 deletions

diff --git a/gbp/command_wrappers.py b/gbp/command_wrappers.py
index b1fbfdfb..a08470a8 100644
--- a/gbp/command_wrappers.py
+++ b/gbp/command_wrappers.py
@@ -52,13 +52,17 @@ class Command(object):
             raise CommandExecFailed
 
 
-class UnpackTGZ(Command):
+class UnpackTarArchive(Command):
     """Wrap tar to Unpack a gzipped tar archive"""
-    def __init__(self, tgz, dir):
-        self.tgz = tgz
+    def __init__(self, archive, dir):
+        self.archive = archive
         self.dir = dir
-        Command.__init__(self, 'tar', [ '-C', dir, '-zxf', tgz ])
-        self.run_error = "Couldn't unpack %s" % self.tgz
+        if archive.lower().endswith(".bz2"):
+            decompress = "--bzip2"
+        else:
+            decompress = "--gzip"
+        Command.__init__(self, 'tar', [ '-C', dir, decompress, '-xf', archive ])
+        self.run_error = "Couldn't unpack %s" % self.archive
 
 
 class RemoveTree(Command):
diff --git a/git-import-dsc b/git-import-dsc
index 1f8f9994..9148d97b 100755
--- a/git-import-dsc
+++ b/git-import-dsc
@@ -88,10 +88,10 @@ def import_initial(src, dirs, options, tagger):
     the 'upstream' branch. Tag everything appropriately.
     """
     try:
-        unpackTGZ = gbpc.UnpackTGZ(src.tgz, dirs['tmp'])
+        unpackTGZ = gbpc.UnpackTarArchive(src.tgz, dirs['tmp'])
         unpackTGZ()
     except gbpc.CommandExecFailed:
-        print >>sys.stderr,"Unpacking of %s failed" % src.tgz
+        print >>sys.stderr,"Unpacking of %s failed" % src.archive
         gbpc.RemoveTree(dirs['tmp'])()
         return False
 
diff --git a/git-import-orig b/git-import-orig
index 3650386b..01a38cc4 100755
--- a/git-import-orig
+++ b/git-import-orig
@@ -36,16 +36,16 @@ def cleanup_tmp_tree(tree):
         print >>sys.stderr, "Removal of tmptree %s failed." % tree
 
 
-def unpack_orig(tgz):
+def unpack_orig(archive):
     """unpack a .orig.tar.gz"""
     try:
-        unpackTGZ = gbpc.UnpackTGZ(tgz, tempfile.mkdtemp(dir='../'))
-        unpackTGZ()
+        unpackArchive = gbpc.UnpackTarArchive(archive, tempfile.mkdtemp(dir='../'))
+        unpackArchive()
     except gbpc.CommandExecFailed:
-        print "Unpacking of %s failed" % (tgz,)
-        cleanup_tmp_tree(unpackTGZ.dir)
+        print "Unpacking of %s failed" % (archive,)
+        cleanup_tmp_tree(unpackArchive.dir)
         return
-    return unpackTGZ.dir
+    return unpackArchive.dir
 
 
 def get_version(tgz):
@@ -93,7 +93,7 @@ def main(argv):
             parser.print_help()
             raise GbpError
         else:
-            tgz = args[0]
+            archive = args[0]
 
         try:
             repo = GitRepository('.')
@@ -111,12 +111,12 @@ create it otherwise use --upstream-branch to specify it.
         if options.version:
             version = options.version
         else:
-            version = get_version(tgz)
+            version = get_version(archive)
 
         if version:
             print "Upstream version is %s" % (version,)
         else:
-            print >>sys.stderr,"Cannot determine upstream version from %s - use -u" % (tgz,)
+            print >>sys.stderr,"Cannot determine upstream version from %s - use -u" % archive
             parser.print_help()
             raise GbpError
 
@@ -125,7 +125,7 @@ create it otherwise use --upstream-branch to specify it.
             print >>sys.stderr, "Repository has uncommitted changes, commit them first: "
             raise GbpError, out
 
-        tmpdir = unpack_orig(tgz)
+        tmpdir = unpack_orig(archive)
         if not tmpdir:
             raise GbpError
         else:
@@ -134,7 +134,7 @@ create it otherwise use --upstream-branch to specify it.
             origdir = glob.glob(tmpdir+'/*')[0]
       
         try:
-            print "Importing %s to upstream branch..." % tgz
+            print "Importing %s to upstream branch..." % archive
             gitCheckoutUpstream()
             gitShowBranch()
             gbpc.GitLoadDirs(verbose=options.verbose)(dir=origdir,
@@ -149,7 +149,7 @@ create it otherwise use --upstream-branch to specify it.
                 gitPullUpstream()
                 gbpc.Dch("%s-1" % (version,), 'New Upstream Version')()
         except gbpc.CommandExecFailed:
-            raise GbpError, "Import of %s failed" % tgz
+            raise GbpError, "Import of %s failed" % archive
     except GbpError, err:
         if len(err.__str__()):
             print >>sys.stderr, err
@@ -159,7 +159,7 @@ create it otherwise use --upstream-branch to specify it.
         cleanup_tmp_tree(tmpdir)
 
     if not ret:
-        print "Succesfully merged version %s of %s into ." % (version, tgz)
+        print "Succesfully merged version %s of %s into ." % (version, archive)
     return ret
 
 if __name__ == "__main__":