diff options
| author | Simon McVittie <smcv@debian.org> | 2018-12-29 16:09:28 +0000 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2018-12-29 17:34:07 +0100 |
| commit | cd4c4d29474b1a22d16bf218be799f6698183d21 (patch) | |
| tree | da6e4d247d8a33a499157f5d69c1b0815c6e9bd1 | |
| parent | cb4c916bfd52eb1734c2c3a4d22b06ede25a3015 (diff) | |
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 <smcv@debian.org>
Closes: #917637
| -rwxr-xr-x | gbp/scripts/pull.py | 4 |
1 files 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: |