diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-10-08 13:19:54 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-10-08 16:02:44 +0100 |
commit | 68db28cfe420b28f3259f1048fa05cbfb903baa7 (patch) | |
tree | c74125fcb9dcf1cb118e8632750c39d84c86e57f /debian | |
parent | e4942960b8725f17f78c4d4113aea34958bb42ee (diff) |
Fix up .orig detection to be less trustful of (ambiguous) filenames.
We cannot simply match the filenaem because `foo_1.0.orig.tar.gz'
might be the `.orig.tar.gz' of foo version 1.0, or the `.tar.gz' of
foo version 1.0.orig.
We need either to consider the whole .dsc (this works since the
formats with no `.orig' or `.debian' or whatever are precisely ones
where there is only one file anyway), or know the version number.
Replace is_orig_file with two functions, one for each situation.
While we're here, do not barf if we find uncompressed tarballs. (We
don't expect to find any but it would be nice if they worked...)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index e0d986c..9082aad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -55,6 +55,7 @@ dgit (1.5~~) unstable; urgency=medium --quilt modes. * Fix two calls to chdir without proper error checking. * Fix a couple of bugs in error reporting. + * Fix up .orig detection to be less trustful of (ambiguous) filenames. Test suite: * When sbuild fails, do not crash due to sed not finding the log |