diff options
| author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2013-09-19 16:22:57 +0300 |
|---|---|---|
| committer | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2014-06-05 14:20:07 +0300 |
| commit | 54c9412b351fee5761040184d9758a45d7f5dc1a (patch) | |
| tree | 407fb29f410883d2deed0ddb2183b192ad909619 /gbp/scripts/import_srpm.py | |
| parent | 550a5fe34bd0c5d063d28bcd6c4fd3bdb78d0137 (diff) | |
| download | git-buildpackage-54c9412b351fee5761040184d9758a45d7f5dc1a.tar.gz git-buildpackage-54c9412b351fee5761040184d9758a45d7f5dc1a.tar.bz2 git-buildpackage-54c9412b351fee5761040184d9758a45d7f5dc1a.zip | |
pq-rpm: bigger refactor of the code
Support '%(upstreamversion)s' as a replacable string in the pq branch
name.
Eliminate some unneeded branch switches that were only needed for
finding/parsing the spec file. Now, spec file is directly searched from
the git repository (from the 'base' branch) if the command is run when
on the pq branch - except for the 'export' subcommand which always
switches to the base branch.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Diffstat (limited to 'gbp/scripts/import_srpm.py')
| -rwxr-xr-x | gbp/scripts/import_srpm.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gbp/scripts/import_srpm.py b/gbp/scripts/import_srpm.py index 01c225cc..5a1d9d64 100755 --- a/gbp/scripts/import_srpm.py +++ b/gbp/scripts/import_srpm.py @@ -138,7 +138,7 @@ def import_spec_patches(repo, spec, dirs): packager = get_packager(spec) # Put patches in a safe place - queue = safe_patches(queue, tmpdir)[1] + queue = safe_patches(queue, tmpdir) for patch in queue: gbp.log.debug("Applying %s" % patch.path) try: |