summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Bartosh <eduard.bartosh@intel.com>2012-05-03 17:17:02 +0300
committerEd Bartosh <eduard.bartosh@intel.com>2012-05-09 11:00:44 +0300
commitdca56e94c1ece757e8d12a0fdb47e58b76fc2dcf (patch)
tree89fa7366af2c4783da4f250d03e2d8d5fc0cfc56
parentb211190e85c503d0d7b5d587d38c20959a600ac3 (diff)
downloadgit-buildpackage-dca56e94c1ece757e8d12a0fdb47e58b76fc2dcf.tar.gz
git-buildpackage-dca56e94c1ece757e8d12a0fdb47e58b76fc2dcf.tar.bz2
git-buildpackage-dca56e94c1ece757e8d12a0fdb47e58b76fc2dcf.zip
rpm: Added .xz to the list of supported compression types for original tarballs
Change-Id: I36ff686e71a6033c9db3b35514429987bf0f68a5
-rw-r--r--gbp/rpm/__init__.py4
1 files 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<name>%s)?.*tar\.?(?P<comp>(bz2|gz|\b))$' % self.rpmhdr[rpm.RPMTAG_NAME])
+ tarball_re = re.compile(r'(?P<name>%s)?.*tar\.?(?P<comp>(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<base>(?P<name>%s)?.*)\.tar\.?(?P<comp>(bz2|gz|\b))$' %
+ tarball_re = re.compile(r'(?P<base>(?P<name>%s)?.*)\.tar\.?(?P<comp>(bz2|gz|xz|\b))$' %
self.specinfo.packages[0].header[rpm.RPMTAG_NAME])
tarball = ""
base = ""