On Fri, Apr 29, 2005 at 08:47:54PM +0200, Peter Eisentraut wrote:
> During the course of working on a package I saw this:
> 
> attempting to revert failed patch apt-mdcache from ./:
> 
>   patch md5sum has changed since failed apply, aborting
>   please clean this up manually, by reverting the changes
>   and removing debian/patched/.//debian/patched/apt-mdcache.dpatch.failed
> 
> There seems to be a mix-up with the path handling.  The correct path to
> that file is
> 
>   debian/patched/apt-mdcache.dpatch.failed

If you can reproduce this "on command", please try whether this
patchlet fixes the bug:

--- /home/mh/dpatch-debian/dpatch-2.0.10/dpatch/dpatch_lowlevel.shpp
2004-10-07 08:19:18.000000000 +0000
+++ dpatch/dpatch_lowlevel.shpp 2005-05-01 17:04:52.982793560 +0000
@@ -233,7 +233,7 @@
                                echo
                                echo "  patch md5sum has changed since failed 
apply, aborting"
                                echo "  please clean this up manually, by 
reverting the changes"
-                               echo "  and removing 
debian/patched/${stamp}.failed"
+                               echo "  and removing 
debian/patched/${patchname%%.dpatch}.dpatch.failed"
                                return 1
                        fi
                        if [ ! -z "${o_v}" ]; then

If you cannot reproduce, please tell me that, and I'll try doing it
here - shouldn't be too hard.

Greetings
Marc

-- 
-----------------------------------------------------------------------------
Marc Haber         | "I don't trust Computers. They | Mailadresse im Header
Mannheim, Germany  |  lose things."    Winona Ryder | Fon: *49 621 72739834
Nordisch by Nature |  How to make an American Quilt | Fax: *49 621 72739835


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to