From dfe552723d6904f4a16a95d5a13fdec43cbb10c8 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Thu, 2 Feb 2017 21:15:15 -0700 Subject: [PATCH] cmd_push: Factor out all prep code Will be re-used by cmd_push_source. Signed-off-by: Sean Whitton Acked-by: Ian Jackson --- dgit | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dgit b/dgit index c344d31e..c17b42a9 100755 --- a/dgit +++ b/dgit @@ -4492,9 +4492,9 @@ END pull(); } -sub cmd_push { +sub prep_push () { parseopts(); - badusage "-p is not allowed with dgit push" if defined $package; + badusage "-p is not allowed with dgit $subcommand" if defined $package; check_not_dirty(); my $clogp = parsechangelog(); $package = getfield $clogp, 'Source'; @@ -4503,7 +4503,7 @@ sub cmd_push { } elsif (@ARGV==1) { ($specsuite) = (@ARGV); } else { - badusage "incorrect arguments to dgit push"; + badusage "incorrect arguments to dgit $subcommand"; } $isuite = getfield $clogp, 'Distribution'; pushing(); @@ -4516,9 +4516,13 @@ sub cmd_push { if (defined $specsuite && $specsuite ne $isuite && $specsuite ne $csuite) { - fail "dgit push: changelog specifies $isuite ($csuite)". + fail "dgit $subcommand: changelog specifies $isuite ($csuite)". " but command line specifies $specsuite"; } +} + +sub cmd_push { + prep_push(); dopush(); } -- 2.30.2