summaryrefslogtreecommitdiff
path: root/gbp
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2013-08-24 11:10:20 +0200
committerGuido Günther <agx@sigxcpu.org>2013-08-24 11:34:56 +0200
commitf793ed0e733cc7ed910bca6ac1e1ef8b59bc090b (patch)
treebbf0b0792079d4c2213e5fdc981ac2efa288f70c /gbp
parent34b207979986fb5ea7805f938b947f2680e38082 (diff)
downloadgit-buildpackage-f793ed0e733cc7ed910bca6ac1e1ef8b59bc090b.tar.gz
git-buildpackage-f793ed0e733cc7ed910bca6ac1e1ef8b59bc090b.tar.bz2
git-buildpackage-f793ed0e733cc7ed910bca6ac1e1ef8b59bc090b.zip
pq: exclude patches from Debian packaging branch
When regenerating the patch queue including patches from the Debian branch is not useful. Addresses parts of See #680705. Thanks: Benjamin Cama for the detailed analysis
Diffstat (limited to 'gbp')
-rwxr-xr-xgbp/scripts/pq.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/gbp/scripts/pq.py b/gbp/scripts/pq.py
index 1ca9ca5c..78f061a0 100755
--- a/gbp/scripts/pq.py
+++ b/gbp/scripts/pq.py
@@ -54,8 +54,10 @@ def export_patches(repo, branch, options):
else:
gbp.log.debug("%s does not exist." % PATCH_DIR)
- patches = repo.format_patches(branch, pq_branch, PATCH_DIR,
- signature=False)
+ patches = repo.format_patches(branch,
+ pq_branch, PATCH_DIR,
+ signature=False,
+ symmetric=False)
if patches:
f = file(SERIES_FILE, 'w')
gbp.log.info("Regenerating patch queue in '%s'." % PATCH_DIR)