diff options
| author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2013-06-06 14:53:45 +0300 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2015-02-20 21:06:40 +0100 |
| commit | f10d67f54b696591f38c61519c45730de059d0c1 (patch) | |
| tree | 40c159e14ea294cdebd34338db52a65e0d49afb3 | |
| parent | fde6fab2f7e314192a1c42a4e9b39399b44b1076 (diff) | |
UpstreamSource.guess_version: recognise debian native tarballs
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
| -rw-r--r-- | gbp/pkg/__init__.py | 5 |
1 files changed, 4 insertions, 1 deletions
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_'<version>.orig.tar.gz' r'^(?P<package>[a-z\d\.\+\-]+)_(?P<version>%s+)\.orig', + # Debian native: 'package_<version>.tar.gz' + r'^(?P<package>[a-z\d\.\+\-]+)_(?P<version>%s+)', # Upstream 'package-<version>.tar.gz' - # or Debian native 'package_<version>.tar.gz' # or directory 'package-<version>': r'^(?P<package>[a-zA-Z\d\.\+\-]+)(-)(?P<version>[0-9]%s*)')) if extra_regex: |