From 32b2e89565f9c37bd3f3c40c77b5c19c5b1f0e2b Mon Sep 17 00:00:00 2001 From: Guido Guenther Date: Tue, 12 Aug 2008 18:21:12 +0200 Subject: detect flat tar archives in git-import-dsc too --- gbp/deb_utils.py | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gbp') 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() -- cgit v1.2.3