aboutsummaryrefslogtreecommitdiffhomepage
path: root/gbp/scripts/pq_rpm.py
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2015-02-08 15:15:03 +0100
committerGuido Günther <agx@sigxcpu.org>2015-02-08 16:29:13 +0100
commit62a5429093ab190a843d5fa7243227c1d799ca3e (patch)
treee64631355e7bfcd50ef8f2bfd8368a3d959428c1 /gbp/scripts/pq_rpm.py
parent64be54db7546e7399b5b758d3f25c507180180e1 (diff)
parse_gbp_commands: support command filtering
When we write out patches to subdirs using a topic we want to filter out this topic from the commit message. Support for this was lost in 7ce15d2434ee42aa5a1afce3d03069c5efb2db1b add it back. Also fix parsing of the deprecated commands.
Diffstat (limited to 'gbp/scripts/pq_rpm.py')
-rwxr-xr-xgbp/scripts/pq_rpm.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/gbp/scripts/pq_rpm.py b/gbp/scripts/pq_rpm.py
index 3d1c4bcd..ab50cad6 100755
--- a/gbp/scripts/pq_rpm.py
+++ b/gbp/scripts/pq_rpm.py
@@ -96,8 +96,10 @@ def generate_patches(repo, start, end, outdir, options):
# Generate patches
for commit in reversed(repo.get_commits(start, end_commit)):
info = repo.get_commit_info(commit)
- cmds = parse_gbp_commands(info, 'gbp-rpm', ('ignore'),
- ('if', 'ifarch'))
+ (cmds, info['body']) = parse_gbp_commands(info,
+ 'gbp-rpm',
+ ('ignore'),
+ ('if', 'ifarch'))
if not 'ignore' in cmds:
patch_fn = format_patch(outdir, repo, info, patches,
options.patch_numbers)