summaryrefslogtreecommitdiff
path: root/gbp
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2013-01-03 16:03:23 +0200
committerMarkus Lehtonen <markus.lehtonen@linux.intel.com>2014-06-05 14:20:06 +0300
commite48816d3a3e175b64aca5dcc168739847f44cbe5 (patch)
tree7f925cbd355547309284e8058b05b76699ac394b /gbp
parent4672c356dc7f3a541c7dddcf28a81cc5c70e84d5 (diff)
downloadgit-buildpackage-e48816d3a3e175b64aca5dcc168739847f44cbe5.tar.gz
git-buildpackage-e48816d3a3e175b64aca5dcc168739847f44cbe5.tar.bz2
git-buildpackage-e48816d3a3e175b64aca5dcc168739847f44cbe5.zip
rpm helpers: parse 'nosource' and 'nopatch' sources correctly
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Diffstat (limited to 'gbp')
-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 1453f24b..b179605e 100644
--- a/gbp/rpm/__init__.py
+++ b/gbp/rpm/__init__.py
@@ -415,7 +415,7 @@ class SpecFile(object):
# workaround rpm parsing bug
if num >= MAX_SOURCE_NUMBER:
num = 0
- if typ == 1:
+ if typ == 1 or typ == 9:
if num in self.sources:
self.sources[num]['filename'] = os.path.basename(name)
self.sources[num]['filename_base'],\
@@ -431,7 +431,7 @@ class SpecFile(object):
self.sources[num]['prefix'] = self.sources[num]['filename_base'] + "/"
else:
gbp.log.err("BUG: we didn't correctly parse all 'Source' tags!")
- if typ == 2:
+ if typ == 2 or typ == 10:
if num in self.patches:
self.patches[num]['filename'] = name
else: