From 0bcc20f07f70ee1ec422f149d6155ed5114be0c1 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 28 Jul 2018 03:58:32 +0100 Subject: dgit: opts_opt_multi_cmd: New @$extra feature Adjust the existing call sites. NFC. Signed-off-by: Ian Jackson --- dgit | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dgit b/dgit index c1a0184..1a4700c 100755 --- a/dgit +++ b/dgit @@ -275,14 +275,16 @@ sub quiltmode_splitbrain () { } sub opts_opt_multi_cmd { + my $extra = shift; my @cmd; push @cmd, split /\s+/, shift @_; + push @cmd, @$extra; push @cmd, @_; @cmd; } sub gbp_pq { - return opts_opt_multi_cmd @gbp_pq; + return opts_opt_multi_cmd [], @gbp_pq; } sub dgit_privdir () { @@ -6351,7 +6353,7 @@ sub cmd_gbp_build { $gbp_build[0] = 'gbp buildpackage'; } } - my @cmd = opts_opt_multi_cmd @gbp_build; + my @cmd = opts_opt_multi_cmd [], @gbp_build; push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=".(shellquote @dbp)); -- cgit v1.2.3