Package: git-buildpackage
Version: 0.9.12
Severity: normal
Tags: patch
I recently discovered that `gbp pull` has a `--redo-pq` option, but
unfortunately it doesn't work any more. In a git checkout of src:glib2.0,
for example:
% gbp pull --redo-pq
gbp:info: Fetching from default remote for each branch
gbp:info: Branch 'pristine-tar' is already up to date.
gbp:info: Branch 'upstream/latest' is already up to date.
gbp:info: Branch 'debian/master' is already up to date.
gbp:error: 'gbp-pq' failed: execution failed: [Errno 2] No such file or
directory: 'gbp-pq': 'gbp-pq'
This appears to have regressed when the gbp-pq command was removed from
PATH in 0.6.24. Please see attached patch.
smcv
>From 9544ce9ef617976b603ee5651f91aadae8424048 Mon Sep 17 00:00:00 2001
From: Simon McVittie <[email protected]>
Date: Sat, 29 Dec 2018 16:09:28 +0000
Subject: [PATCH] gbp-pull: Invoke gbp pq correctly for --redo-pq option
`gbp pull --redo-pq` assumed that `gbp-pq` exists in PATH, which isn't
normally true since 0.6.24 (2015).
Signed-off-by: Simon McVittie <[email protected]>
---
gbp/scripts/pull.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gbp/scripts/pull.py b/gbp/scripts/pull.py
index 9027d90..c9bea15 100755
--- a/gbp/scripts/pull.py
+++ b/gbp/scripts/pull.py
@@ -217,8 +217,8 @@ def main(argv):
if options.redo_pq:
repo.set_branch(options.debian_branch)
- Command("gbp-pq")(["drop"])
- Command("gbp-pq")(["import"])
+ Command("gbp")(["pq", "drop"])
+ Command("gbp")(["pq", "import"])
repo.set_branch(current)
except KeyboardInterrupt:
--
2.20.1
