summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-07-26 12:41:50 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-07-26 13:00:47 +0100
commitd33854da24295c408c2981db53545d1159429f55 (patch)
tree55ea01436b41323d0e880cd44d3c9482d8f0308d /dgit
parent5ef05b436104524c65da4a0753882fdb7d77b009 (diff)
dgit: Move cmd_push_source down the file
Pure code motion. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit42
1 files changed, 21 insertions, 21 deletions
diff --git a/dgit b/dgit
index 9384f64..23e66b2 100755
--- a/dgit
+++ b/dgit
@@ -4758,27 +4758,6 @@ sub cmd_push {
our $sourcechanges;
-sub cmd_push_source {
- prep_push();
- fail "dgit push-source: --include-dirty/--ignore-dirty does not make".
- "sense with push-source!" if $includedirty;
- build_maybe_quilt_fixup();
- if ($changesfile) {
- my $changes = parsecontrol("$buildproductsdir/$changesfile",
- "source changes file");
- unless (test_source_only_changes($changes)) {
- fail "user-specified changes file is not source-only";
- }
- } else {
- # Building a source package is very fast, so just do it
- build_source();
- die "er, patches are applied dirtily but shouldn't be.."
- if $patches_applied_dirtily;
- $changesfile = $sourcechanges;
- }
- dopush();
-}
-
#---------- remote commands' implementation ----------
sub pre_remote_push_build_host {
@@ -6492,6 +6471,27 @@ sub cmd_build_source {
printdone "source built, results in $dscfn and $sourcechanges";
}
+sub cmd_push_source {
+ prep_push();
+ fail "dgit push-source: --include-dirty/--ignore-dirty does not make".
+ "sense with push-source!" if $includedirty;
+ build_maybe_quilt_fixup();
+ if ($changesfile) {
+ my $changes = parsecontrol("$buildproductsdir/$changesfile",
+ "source changes file");
+ unless (test_source_only_changes($changes)) {
+ fail "user-specified changes file is not source-only";
+ }
+ } else {
+ # Building a source package is very fast, so just do it
+ build_source();
+ die "er, patches are applied dirtily but shouldn't be.."
+ if $patches_applied_dirtily;
+ $changesfile = $sourcechanges;
+ }
+ dopush();
+}
+
sub cmd_sbuild {
build_prep(WANTSRC_SOURCE); # not BUILDER because sbuild uses the .dsc
build_source();