From 9d2b2161c18c031a96bc2ba3b8e749f2cc44fc23 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 8 Oct 2016 22:29:41 +0100 Subject: gbp options: Honour --gbp-pq instead of --gbp Signed-off-by: Ian Jackson --- dgit | 6 +++--- tests/tests/quilt-gbp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dgit b/dgit index 653f4ce..630c9f7 100755 --- a/dgit +++ b/dgit @@ -97,8 +97,8 @@ our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git); our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git); our (@dpkggenchanges) = qw(dpkg-genchanges); our (@mergechanges) = qw(mergechanges -f); -our (@gbp) = qw(gbp); our (@gbp_build) = (''); +our (@gbp_pq) = ('gbp pq'); our (@changesopts) = (''); our %opts_opt_map = ('dget' => \@dget, # accept for compatibility @@ -113,8 +113,8 @@ our %opts_opt_map = ('dget' => \@dget, # accept for compatibility 'dpkg-source' => \@dpkgsource, 'dpkg-buildpackage' => \@dpkgbuildpackage, 'dpkg-genchanges' => \@dpkggenchanges, - 'gbp' => \@gbp, 'gbp-build' => \@gbp_build, + 'gbp-pq' => \@gbp_pq, 'ch' => \@changesopts, 'mergechanges' => \@mergechanges); @@ -256,7 +256,7 @@ sub opts_opt_multi_cmd { } sub gbp_pq { - return (@gbp, qw(pq)); + return opts_opt_multi_cmd @gbp_pq; } #---------- remote protocol support, common ---------- diff --git a/tests/tests/quilt-gbp b/tests/tests/quilt-gbp index 085ef03..23083a7 100755 --- a/tests/tests/quilt-gbp +++ b/tests/tests/quilt-gbp @@ -16,14 +16,14 @@ t-newtag t-dgit --quilt=gbp build-source -t-dgit --quilt=gbp --gbp=no-such-command-gbp build-source +t-dgit --quilt=gbp --gbp-pq=no-such-command-gbp build-source echo spong >debian/pointless-for-dgit-test git add debian/pointless-for-dgit-test git commit -m Pointless t-expect-fail no-such-command-gbp \ -t-dgit --quilt=gbp --clean=git --gbp=no-such-command-gbp build-source +t-dgit --quilt=gbp --clean=git --gbp-pq=no-such-command-gbp build-source t-dgit --quilt=gbp --clean=git build-source -- cgit v1.2.3