From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Date: Thu, 22 Aug 2013 13:24:13 +0000 (+0300)
Subject: UpstreamSource: implement prefix guessing
X-Git-Tag: debian/0.6.26~64
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6ce67cabbe2c379647acadd8c5105c76176023b5;p=tools%2Fgit-buildpackage.git

UpstreamSource: implement prefix guessing

Add a new attribure 'prefix', i.e. the "leading directory name" in an
archive. For example, this usually is '<name>-<version>' in release
tarballs.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>

Conflicts:
	gbp/pkg/__init__.py
---

diff --git a/gbp/pkg/__init__.py b/gbp/pkg/__init__.py
index 2ed43d09..79067982 100644
--- a/gbp/pkg/__init__.py
+++ b/gbp/pkg/__init__.py
@@ -509,17 +509,6 @@ class UpstreamSource(object):
         except gbpc.CommandExecFailed:
             raise GbpError("Unpacking of %s failed" % self.path)
 
-    def _unpacked_toplevel(self, dir):
-        """unpacked archives can contain a leading directory or not"""
-        unpacked = glob.glob('%s/*' % dir)
-        unpacked.extend(glob.glob("%s/.*" % dir)) # include hidden files and folders
-        # Check that dir contains nothing but a single folder:
-        if len(unpacked) == 1 and os.path.isdir(unpacked[0]):
-            return unpacked[0]
-        else:
-            # We can determine "no prefix" from this
-            return os.path.join(dir, ".")
-
     def _unpack_tar(self, dir, filters):
         """
         Unpack a tarball to I{dir} applying a list of I{filters}. Leave the