summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2011-10-16 14:20:34 +0200
committerGuido Günther <agx@sigxcpu.org>2011-10-16 19:16:01 +0200
commitefe9220041ae67ba81d0cb1f761364ef16134ac7 (patch)
treeb622d0777f5fbe15b2ce2ecdd6c0f1bcc460c874
parent3509cd136b215c314366f0d46aff4cab50c47302 (diff)
Use known_compressions in guess_upstream_version too
Closes: #645477
-rw-r--r--gbp/deb.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/gbp/deb.py b/gbp/deb.py
index 3c1de78..fab0a63 100644
--- a/gbp/deb.py
+++ b/gbp/deb.py
@@ -586,9 +586,13 @@ def guess_upstream_version(archive, extra_regex=r''):
('kvm', '87+dfsg')
>>> guess_upstream_version('foo-Bar_0.2.orig.tar.gz')
>>> guess_upstream_version('foo-Bar-a.b.tar.gz')
+ >>> guess_upstream_version('foo-bar_0.2.orig.tar.xz')
+ ('foo-bar', '0.2')
+ >>> guess_upstream_version('foo-bar_0.2.orig.tar.lzma')
+ ('foo-bar', '0.2')
"""
version_chars = r'[a-zA-Z\d\.\~\-\:\+]'
- extensions = r'\.tar\.(gz|bz2)'
+ extensions = r'\.tar\.(%s)' % "|".join(UpstreamSource.known_compressions())
version_filters = map ( lambda x: x % (version_chars, extensions),
( # Debian package_<version>.orig.tar.gz: