diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-11-07 11:10:39 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-07-01 23:53:45 +0100 |
commit | 8ddd53c0140e1e2649ab2233c8fdbd42fbfa734d (patch) | |
tree | 99f2fb4a07b4199a2ecb7149f85cf906bdfa002f | |
parent | 81aaaee0875d911dca013460b1087e5b56922c0f (diff) |
Break out changespat (no functional change)
-rwxr-xr-x | dgit | 16 |
1 files changed, 10 insertions, 6 deletions
@@ -147,6 +147,11 @@ sub dscfn ($) { return srcfn($vsn,".dsc"); } +sub changespat ($;$) { + my ($vsn, $arch) = @_; + return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes"; +} + our $us = 'dgit'; initdebug(''); @@ -1997,12 +2002,11 @@ END } my $head = git_rev_parse('HEAD'); if (!$changesfile) { - my $multi = "$buildproductsdir/". - "${package}_".(stripepoch $cversion)."_multi.changes"; + my $multi = "$buildproductsdir/".changespat $cversion,'multi'; if (stat_exists "$multi") { $changesfile = $multi; } else { - my $pat = "${package}_".(stripepoch $cversion)."_*.changes"; + my $pat = changespat $cversion; my @cs = glob "$buildproductsdir/$pat"; fail "failed to find unique changes file". " (looked for $pat in $buildproductsdir, or $multi);". @@ -3106,7 +3110,7 @@ sub build_source { $suppress_clean = 1; } build_prep(); - $sourcechanges = "${package}_".(stripepoch $version)."_source.changes"; + $sourcechanges = changespat $version,'source'; $dscfn = dscfn($version); if ($cleanmode eq 'dpkg-source') { runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S), @@ -3136,7 +3140,7 @@ sub cmd_build_source { sub cmd_sbuild { build_source(); changedir ".."; - my $pat = "${package}_".(stripepoch $version)."_*.changes"; + my $pat = changespat $version; if (act_local()) { stat_exists $dscfn or fail "$dscfn (in parent directory): $!"; stat_exists $sourcechanges @@ -3160,7 +3164,7 @@ sub cmd_sbuild { if $l =~ m/\.dsc$/; } runcmd_ordryrun_local @mergechanges, @changesfiles; - my $multichanges = "${package}_".(stripepoch $version)."_multi.changes"; + my $multichanges = changespat $version,'multi'; if (act_local()) { stat_exists $multichanges or fail "$multichanges: $!"; foreach my $cf (glob $pat) { |