Control: severity -1 important Hi!
On Tue, 2017-01-10 at 17:44:19 +0000, Ian Jackson wrote: > Package: dpkg-dev > Version: 1.18.15 > Severity: serious > Control: fixed -1 1.15.11 > I assume that it is an important goal for dpkg-source that it should > be able to extract all source packages which previous versions of > dpkg-source created and which ended up in places like snapshot.d.o. I consider it important, but there might be times when it might not be possible. Unfortunatelt the C-style filename quoting in diffs is one of those, as is some instances of the git format patch mess. :( I've set the severity to important accordingly. > dpkg-source: info: applying waf-as-source.patch > patching file buildtools/README > patching file buildtools/bin/README > patching file buildtools/bin/waf-svn > Not deleting file buildtools/bin/waf-svn as content differs from patch > patching file buildtools/update-waf.sh > patching file buildtools/wafadmin/py3kfixes.py […] > dpkg-source: info: the patch has fuzz which is not allowed, or is malformed > dpkg-source: info: if patch 'waf-as-source.patch' is correctly applied by > quilt, use 'quilt refresh' to update it > dpkg-source: info: restoring quilt backup files for waf-as-source.patch > dpkg-source: error: LC_ALL=C patch -t -F 0 -N -p1 -u -V never -E -b -B > .pc/waf-as-source.patch/ --reject-file=- < > samba-3.6.5/debian/patches/waf-as-source.patch gave error exit status 1 The problem is that "Not deleting" message. This is coming from a git formatted patch which deletes that file, but the sha1sum does not match so patch refuses to remove the file. I'm not sure there's a nice way to handle this. I think refusing to remove is probably the correct answer here. But patch didn't use to do that, so making this non-fatal could be perhaps fine too. I've not tested but an option would be what I've mentioned before, which is to handle git formatted patches directly by dpkg-source, which means the file would be already removed, and then patch might not fail? Thanks, Guillem
