chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sbuild: Rename the used-up .changes files to `.inmulti'
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index 0b66d390ea6adc6f5bd102fd4480f81e639d8933..a4dea9b44f6bd67cba42ebe17c361e27e7eb0004 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-3109,11
+3109,11
@@
sub build_source {
$sourcechanges = "${package}_".(stripepoch $version)."_source.changes";
$dscfn = dscfn($version);
if ($cleanmode eq 'dpkg-source') {
$sourcechanges = "${package}_".(stripepoch $version)."_source.changes";
$dscfn = dscfn($version);
if ($cleanmode eq 'dpkg-source') {
- runcmd_ordryrun_local
(@dpkgbuildpackage, qw(-us -uc -S)
),
- changesopts();
+ runcmd_ordryrun_local
@dpkgbuildpackage, qw(-us -uc -S
),
+
changesopts();
} elsif ($cleanmode eq 'dpkg-source-d') {
} elsif ($cleanmode eq 'dpkg-source-d') {
- runcmd_ordryrun_local
(@dpkgbuildpackage, qw(-us -uc -S -d)
),
- changesopts();
+ runcmd_ordryrun_local
@dpkgbuildpackage, qw(-us -uc -S -d
),
+
changesopts();
} else {
my $pwd = must_getcwd();
my $leafdir = basename $pwd;
} else {
my $pwd = must_getcwd();
my $leafdir = basename $pwd;
@@
-3153,11
+3153,15
@@
sub cmd_sbuild {
or $a cmp $b
} @changesfiles;
fail "wrong number of different changes files (@changesfiles)"
or $a cmp $b
} @changesfiles;
fail "wrong number of different changes files (@changesfiles)"
- unless @changesfiles;
+ unless @changesfiles
==2
;
runcmd_ordryrun_local @mergechanges, @changesfiles;
my $multichanges = "${package}_".(stripepoch $version)."_multi.changes";
if (act_local()) {
stat_exists $multichanges or fail "$multichanges: $!";
runcmd_ordryrun_local @mergechanges, @changesfiles;
my $multichanges = "${package}_".(stripepoch $version)."_multi.changes";
if (act_local()) {
stat_exists $multichanges or fail "$multichanges: $!";
+ foreach my $cf (glob $pat) {
+ next if $cf eq $multichanges;
+ rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
+ }
}
printdone "build successful, results in $multichanges\n" or die $!;
}
}
printdone "build successful, results in $multichanges\n" or die $!;
}