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: Check that the binary .changes file doesn't contain a .dsc.
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index a4dea9b44f6bd67cba42ebe17c361e27e7eb0004..9ac8d54435508550c0b557794f8a32a4d70437d6 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-3154,6
+3154,11
@@
sub cmd_sbuild {
} @changesfiles;
fail "wrong number of different changes files (@changesfiles)"
unless @changesfiles==2;
} @changesfiles;
fail "wrong number of different changes files (@changesfiles)"
unless @changesfiles==2;
+ my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
+ foreach my $l (split /\n/, getfield $binchanges, 'Files') {
+ fail "$l found in binaries changes file $binchanges"
+ if $l =~ m/\.dsc$/;
+ }
runcmd_ordryrun_local @mergechanges, @changesfiles;
my $multichanges = "${package}_".(stripepoch $version)."_multi.changes";
if (act_local()) {
runcmd_ordryrun_local @mergechanges, @changesfiles;
my $multichanges = "${package}_".(stripepoch $version)."_multi.changes";
if (act_local()) {