severity 608829 normal
thanks

On Mon, 03 Jan 2011, Bastian Blank wrote:
> Severity: important

It's not a major usability problem... dropping to normal.

> dpkg-source rejects valid patch files:
> | dpkg-source: error: diff 
> `xen/debian/patches/upstream-21334:993458f6c5a0+21405:ae381a864b4f' patches 
> file xen/xen/arch/x86/mm/hap/p2m-ept.c twice
> 
> Unified diff files are applied from the start to the end, file by file.
> There is no notion of duplicate files in it.

While such files are valid patch files, "diff" will never generate such a
patch. So it's a sign either of a mistake or of a somewhat manually
crafted diff.. I think it's best to be on the safe side and error out.

This restriction exists since forever in dpkg-source, it was applied
in .diff.gz files and it's thus now also applied on quilt patches.

> quilt and patch applies this patch without problems:
> | Applying patch upstream-21334:993458f6c5a0+21405:ae381a864b4f
> | patching file xen/arch/x86/mm/hap/p2m-ept.c
> | patching file xen/arch/x86/mm/hap/p2m-ept.c

And quilt refresh will get rid of that.

I don't know whether I'm going to accept this request. I'm rather enclined
to tag it wontfix. But I welcome supplementary feedback.

Cheers,
-- 
Raphaël Hertzog ◈ Debian Developer

Follow my Debian News ▶ http://RaphaelHertzog.com (English)
                      ▶ http://RaphaelHertzog.fr (Français)




--
To UNSUBSCRIBE, email to debian-dpkg-bugs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to