From f10d67f54b696591f38c61519c45730de059d0c1 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Thu, 6 Jun 2013 14:53:45 +0300 Subject: UpstreamSource.guess_version: recognise debian native tarballs Signed-off-by: Markus Lehtonen --- gbp/pkg/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gbp/pkg/__init__.py b/gbp/pkg/__init__.py index f3a81ae..a8a7ebd 100644 --- a/gbp/pkg/__init__.py +++ b/gbp/pkg/__init__.py @@ -172,6 +172,8 @@ class PkgPolicy(object): ('foo-bar', '0.2') >>> PkgPolicy.guess_upstream_src_version('foo-bar-0.2.tlz') ('foo-bar', '0.2') + >>> PkgPolicy.guess_upstream_src_version('foo-bar_0.2.tar.gz') + ('foo-bar', '0.2') """ version_chars = r'[a-zA-Z\d\.\~\-\:\+]' basename = parse_archive_filename(os.path.basename(filename))[0] @@ -179,8 +181,9 @@ class PkgPolicy(object): version_filters = map ( lambda x: x % version_chars, ( # Debian upstream tarball: package_'.orig.tar.gz' r'^(?P[a-z\d\.\+\-]+)_(?P%s+)\.orig', + # Debian native: 'package_.tar.gz' + r'^(?P[a-z\d\.\+\-]+)_(?P%s+)', # Upstream 'package-.tar.gz' - # or Debian native 'package_.tar.gz' # or directory 'package-': r'^(?P[a-zA-Z\d\.\+\-]+)(-)(?P[0-9]%s*)')) if extra_regex: -- cgit v1.2.3