diff options
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 15 |
1 files changed, 13 insertions, 2 deletions
@@ -4938,6 +4938,17 @@ END printdone "build successful, results in $result\n" or die $!; } +sub postbuild_mergechanges_vanilla ($) { + my ($wantsrc) = @_; + if ($wantsrc == 1) { + in_parent { + postbuild_mergechanges(undef); + }; + } else { + printdone "build successful\n"; + } +} + sub cmd_build { my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV); my $wantsrc = massage_dbp_args \@dbp; @@ -4952,7 +4963,7 @@ sub cmd_build { runcmd_ordryrun_local @dbp; } maybe_unapply_patches_again(); - printdone "build successful\n"; + postbuild_mergechanges_vanilla $wantsrc; } sub pre_gbp_build { @@ -4988,7 +4999,7 @@ sub cmd_gbp_build { push @cmd, changesopts(); runcmd_ordryrun_local @cmd, @ARGV; } - printdone "build successful\n"; + postbuild_mergechanges_vanilla $wantsrc; } sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0 |