gbp-pull: Invoke gbp pq correctly for --redo-pq option
authorSimon McVittie <smcv@debian.org>
Sat, 29 Dec 2018 16:09:28 +0000 (16:09 +0000)
committerGuido Günther <agx@sigxcpu.org>
Sat, 29 Dec 2018 16:34:07 +0000 (17:34 +0100)
`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 <smcv@debian.org>
Closes: #917637
gbp/scripts/pull.py

index 9027d900bbecbc5cf818d261eb2e4e6a914f0581..c9bea152cccce07f913b271b088f62172663b103 100755 (executable)
@@ -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: