diff options
| author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2014-01-30 17:46:18 +0200 |
|---|---|---|
| committer | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2014-11-14 14:22:07 +0200 |
| commit | 99ded0575c8064698564884102cdd07e371b9af9 (patch) | |
| tree | 3b09c26fb25ef0327daabed04319cc34808498e5 /gbp/scripts/pq.py | |
| parent | dc2ef711858c4ff177f1cd6ce741d42cc3a8d3c2 (diff) | |
| download | git-buildpackage-99ded0575c8064698564884102cdd07e371b9af9.tar.gz git-buildpackage-99ded0575c8064698564884102cdd07e371b9af9.tar.bz2 git-buildpackage-99ded0575c8064698564884102cdd07e371b9af9.zip | |
pq/parse_gbp_commands: return non-matched lines
In order to make it easy to re-use this function in changelog
generation.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Diffstat (limited to 'gbp/scripts/pq.py')
| -rwxr-xr-x | gbp/scripts/pq.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gbp/scripts/pq.py b/gbp/scripts/pq.py index c48ff31c..515c48aa 100755 --- a/gbp/scripts/pq.py +++ b/gbp/scripts/pq.py @@ -77,8 +77,9 @@ def generate_patches(repo, start, end, outdir, options): for commit in rev_list: info = repo.get_commit_info(commit) topic = parse_old_style_topic(info) - cmds = parse_gbp_commands(info, 'gbp', ('ignore'), ('topic')) - cmds.update(parse_gbp_commands(info, 'gbp-pq', ('ignore'), ('topic'))) + cmds = parse_gbp_commands(info, 'gbp', ('ignore'), ('topic'))[0] + cmds.update(parse_gbp_commands(info, 'gbp-pq', ('ignore'), + ('topic'))[0]) if not 'ignore' in cmds: if 'topic' in cmds: topic = cmds['topic'] |