summaryrefslogtreecommitdiff
path: root/gbp/scripts/import_srpm.py
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2013-01-11 16:43:32 +0200
committerMarkus Lehtonen <markus.lehtonen@linux.intel.com>2014-06-05 14:20:06 +0300
commita27a9f9c173bf2a41ef0675a4b9f6d3e8dee263d (patch)
treeae18b896e7c6388f7b872113852ae60a27619548 /gbp/scripts/import_srpm.py
parent821251cbd8d7076e49729ac88eabd92265caedec (diff)
downloadgit-buildpackage-a27a9f9c173bf2a41ef0675a4b9f6d3e8dee263d.tar.gz
git-buildpackage-a27a9f9c173bf2a41ef0675a4b9f6d3e8dee263d.tar.bz2
git-buildpackage-a27a9f9c173bf2a41ef0675a4b9f6d3e8dee263d.zip
rpm.SpecFile: drop the internal sources structure
Get rid of duplicate data tracking. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Yigang Wen <yigangx.wen@intel.com>
Diffstat (limited to 'gbp/scripts/import_srpm.py')
-rwxr-xr-xgbp/scripts/import_srpm.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/gbp/scripts/import_srpm.py b/gbp/scripts/import_srpm.py
index 92bb022b..be03d187 100755
--- a/gbp/scripts/import_srpm.py
+++ b/gbp/scripts/import_srpm.py
@@ -327,9 +327,9 @@ def main(argv):
# Need to copy files to the packaging directory given by caller
files = [os.path.basename(patch.path) \
for patch in spec.patchseries(unapplied=True, ignored=True)]
- for num, src in spec.sources.iteritems():
- if num != spec.orig_src_num:
- files.append(src['filename'])
+ for num, filename in spec.sources().iteritems():
+ if not spec.orig_src or num != spec.orig_src['num']:
+ files.append(os.path.basename(filename))
files.append(os.path.join(spec.specdir, spec.specfile))
for fname in files:
fpath = os.path.join(dirs['src'], fname)