diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-11-07 13:13:59 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-07-01 23:53:45 +0100 |
commit | a4877226404a1a34181bb93c513af716834d7cb4 (patch) | |
tree | b5c1833b832e87fc2aa706b139c8fb53f66433e4 | |
parent | b85aa466413f10b9220edb20482a896d5be3d8c9 (diff) |
No longer tolerate a multitude of .changes files when doing push.
Instead, insist on a single one. This eliminates a potential for a
variety of surprises, where dgit would upload something different to
the user expected.
We no longer need to behave this way because nowadays the sbuild build
(which was the real use case, because it would generate a .source and
a .ARCH changes as well as the final .multi) renames the intermediate
changes files.
Also --rm-old-changes helps.
-rw-r--r-- | debian/changelog | 2 | ||||
-rwxr-xr-x | dgit | 19 | ||||
-rw-r--r-- | dgit.1 | 3 |
3 files changed, 10 insertions, 14 deletions
diff --git a/debian/changelog b/debian/changelog index b02081e..331a316 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,8 @@ dgit (1.5~~) unstable; urgency=medium * Introduce --rm-old-changes to delete previous builds' changes files. * Remove any pre-existing _source.changes file before building source, as a safety check. + * No longer tolerate a multitude of .changes files when doing push. + Instead, insist on a single one. Documentation: * Document the dgit-distro.DISTRO.quilt-mode config setting. @@ -2003,18 +2003,13 @@ END } my $head = git_rev_parse('HEAD'); if (!$changesfile) { - my $multi = "$buildproductsdir/".changespat $cversion,'multi'; - if (stat_exists "$multi") { - $changesfile = $multi; - } else { - my $pat = changespat $cversion; - my @cs = glob "$buildproductsdir/$pat"; - fail "failed to find unique changes file". - " (looked for $pat in $buildproductsdir, or $multi);". - " perhaps you need to use dgit -C" - unless @cs==1; - ($changesfile) = @cs; - } + my $pat = changespat $cversion; + my @cs = glob "$buildproductsdir/$pat"; + fail "failed to find unique changes file". + " (looked for $pat in $buildproductsdir);". + " perhaps you need to use dgit -C" + unless @cs==1; + ($changesfile) = @cs; } else { $changesfile = "$buildproductsdir/$changesfile"; } @@ -514,8 +514,7 @@ How to set this up is not yet documented. .BI -C changesfile Specifies the .changes file which is to be uploaded. By default dgit push looks for single .changes file in the parent directory whose -filename suggests it is for the right package and version - or, -if there is a _multi.changes file, dgit uses that. +filename suggests it is for the right package and version. If the specified .I changesfile |