From cd4c4d29474b1a22d16bf218be799f6698183d21 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sat, 29 Dec 2018 16:09:28 +0000 Subject: 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 Closes: #917637 --- 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 9027d900..c9bea152 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: -- cgit v1.2.3