X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=56f1605ef2ab844505260f22c5404e0586f204c5;hb=8f6bfa045b93231a81821ef49222168b223d31e2;hp=eca2303e86add5d5aa9677fc5cff529b97eddc81;hpb=67e3687e3223a97f2d2952ba2aba32d0c177966b;p=dgit.git diff --git a/dgit b/dgit index eca2303e..56f1605e 100755 --- a/dgit +++ b/dgit @@ -4758,6 +4758,8 @@ sub cmd_push { sub cmd_push_source { prep_push(); + fail "dgit push-source: --include-dirty/--ignore-dirty does not make". + "sense with push-source!" if $includedirty; if ($changesfile) { my $changes = parsecontrol("$buildproductsdir/$changesfile", "source changes file"); @@ -6106,6 +6108,10 @@ sub cmd_clean () { maybe_unapply_patches_again(); } +# return values from massage_dbp_args are one or both of these flags +sub WANTSRC_SOURCE () { 01; } # caller should build source (separately) +sub WANTSRC_BUILDER () { 02; } # caller should run dpkg-buildpackage + sub build_or_push_prep_early () { our $build_or_push_prep_early_done //= 0; return if $build_or_push_prep_early_done++; @@ -6181,10 +6187,6 @@ sub changesopts () { return (changesopts_initial(), changesopts_version()); } -# return values from massage_dbp_args are one or both of these flags -sub WANTSRC_SOURCE () { 01; } # caller should build source (separately) -sub WANTSRC_BUILDER () { 02; } # caller should run dpkg-buildpackage - sub massage_dbp_args ($;$) { my ($cmd,$xargs) = @_; # We need to: @@ -6247,7 +6249,7 @@ sub postbuild_mergechanges ($) { # or if that is undef, be a no-op. # Returns the changes file to report to the user. my $pat = changespat $version; - my @changesfiles = glob $pat; + my @changesfiles = grep { !m/_multi\.changes/ } glob $pat; @changesfiles = sort { ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/) or $a cmp $b @@ -6284,7 +6286,10 @@ sub midbuild_checkchanges () { my $pat = changespat $version; return if $rmchanges; my @unwanted = map { s#.*/##; $_; } glob "$bpd_glob/$pat"; - @unwanted = grep { $_ ne changespat $version,'source' } @unwanted; + @unwanted = grep { + $_ ne changespat $version,'source' and + $_ ne changespat $version,'multi' + } @unwanted; fail <