From d11c2a1b90a065739adcd754319f3924f8124972 Mon Sep 17 00:00:00 2001 From: Guido Guenther Date: Fri, 8 Feb 2008 17:08:19 +0100 Subject: detect flat tar archives (Closes: #463822) --- git-import-orig | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/git-import-orig b/git-import-orig index f3344bec..ade8437b 100755 --- a/git-import-orig +++ b/git-import-orig @@ -169,7 +169,13 @@ on howto create it otherwise use --upstream-branch to specify it. unpack_orig(archive, tmpdir) if options.verbose: print "Unpacked %s to '%s'" % (archive , tmpdir) - orig_dir = glob.glob(tmpdir+'/*')[0] + unpacked = glob.glob(tmpdir+'/*') + # archive has everything packed up in one subdir: + if len(unpacked) == 1: + orig_dir = unpacked[0] + # archive content not in a subdir + else: + orig_dir = tmpdir try: if not is_empty: -- cgit v1.2.3