detect flat tar archives in git-import-dsc too

1 files changed, 10 insertions, 0 deletions

diff --git a/gbp/deb_utils.py b/gbp/deb_utils.py
index 91e3fc23..a9bd1fbc 100644
--- a/gbp/deb_utils.py
+++ b/gbp/deb_utils.py
@@ -9,6 +9,7 @@ import os
 import re
 import shutil
 import sys
+import glob
 import command_wrappers as gbpc
 from errors import GbpError
 
@@ -192,6 +193,15 @@ def unpack_orig(archive, tmpdir, filters):
     return unpackArchive.dir
 
 
+def tar_toplevel(dir):
+    """tar archives can contain a leading directory not"""
+    unpacked = glob.glob('%s/*' % dir)
+    if len(unpacked) == 1:
+        return unpacked[0]
+    else:
+        return dir
+
+
 def _test():
     import doctest
     doctest.testmod()