X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=51df7c30defe743bd435f8318a718bf4b7e36229;hp=7ec09de85d5932edccdd4b1308f38b505aa41e69;hb=8ddd53c0140e1e2649ab2233c8fdbd42fbfa734d;hpb=81aaaee0875d911dca013460b1087e5b56922c0f

diff --git a/dgit b/dgit
index 7ec09de8..51df7c30 100755
--- a/dgit
+++ b/dgit
@@ -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) {