From dca56e94c1ece757e8d12a0fdb47e58b76fc2dcf Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Thu, 3 May 2012 17:17:02 +0300 Subject: rpm: Added .xz to the list of supported compression types for original tarballs Change-Id: I36ff686e71a6033c9db3b35514429987bf0f68a5 --- gbp/rpm/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gbp/rpm/__init__.py b/gbp/rpm/__init__.py index f97ba497..24736946 100644 --- a/gbp/rpm/__init__.py +++ b/gbp/rpm/__init__.py @@ -148,7 +148,7 @@ class SrcRpmFile(object): Try to guess the name of the primary upstream/source tarball returns a tuple with tarball filename and compression suffix """ - tarball_re = re.compile(r'(?P%s)?.*tar\.?(?P(bz2|gz|\b))$' % self.rpmhdr[rpm.RPMTAG_NAME]) + tarball_re = re.compile(r'(?P%s)?.*tar\.?(?P(bz2|gz|xz|\b))$' % self.rpmhdr[rpm.RPMTAG_NAME]) tarball = "" comp = "" @@ -416,7 +416,7 @@ class SpecFile(object): Try to guess the name of the primary upstream/source tarball returns a tuple with tarball filename and compression suffix """ - tarball_re = re.compile(r'(?P(?P%s)?.*)\.tar\.?(?P(bz2|gz|\b))$' % + tarball_re = re.compile(r'(?P(?P%s)?.*)\.tar\.?(?P(bz2|gz|xz|\b))$' % self.specinfo.packages[0].header[rpm.RPMTAG_NAME]) tarball = "" base = "" -- cgit v1.2.3