UpstreamSource.guess_version: don't check for directories

Directories are not recognized anyway, if guess_version() is called for
non-existent sources. And, parse_archive_filename() works fine for
directory names, too.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

diff --git a/gbp/pkg/__init__.py b/gbp/pkg/__init__.py
index 18ca81256fb9fc8b8c9062dbc54a1cb40389317d..1fd17418d9b1b8306f956a2580e3895d69576905 100644 (file)
--- a/gbp/pkg/__init__.py
+++ b/gbp/pkg/__init__.py
@@ -328,8 +328,10 @@ class UpstreamSource(object):
         Guess the package name and version from the filename of an upstream
         archive.
 
-        @param extra_regex: extra regular expression to check
-        @type extra_regex: raw C{string}
+        @param extra_regex: additional regex to apply, needs a 'package' and a
+                            'version' group
+        @return: (package name, version) or None.
+        @rtype: tuple
 
         >>> UpstreamSource('foo-bar_0.2.orig.tar.gz').guess_version()
         ('foo-bar', '0.2')
@@ -356,17 +358,9 @@ class UpstreamSource(object):
         ('foo-bar', '0.2')
         >>> UpstreamSource('foo-bar-0.2.tlz').guess_version()
         ('foo-bar', '0.2')
-
-        @param extra_regex: additional regex to apply, needs a 'package' and a
-                            'version' group
-        @return: (package name, version) or None.
-        @rtype: tuple
         """
         version_chars = r'[a-zA-Z\d\.\~\-\:\+]'
-        if self.is_dir():
-            basename = os.path.basename(self.path)
-        else:
-            basename = parse_archive_filename(os.path.basename(self.path))[0]
+        basename = parse_archive_filename(os.path.basename(self.path))[0]
 
         version_filters = map ( lambda x: x % version_chars,
                            ( # Debian upstream tarball: package_'<version>.orig.tar.gz'