Processed: Re: Bug#325871: Two identical zlib patches cancel each other
Processing commands for [EMAIL PROTECTED]: > tag 325871 +pending Bug#325871: Two identical zlib patches cancel each other There were no tags set. Tags added: pending > thanks Stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database) -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Bug#325871: Two identical zlib patches cancel each other
On Wed, Aug 31, 2005 at 02:29:51PM +0200, Wolfram Gloger wrote:
> Package: kernel-source-2.4.27
> Version: 2.4.27-11
>
> Hi,
>
> kernel-source-2.4.27_2.4.27-11.diff.gz contains two identical patches,
> 182_linux-zlib-fixes.dif and 183_zisofs.diff.
>
> When I do ./debian/rules patch both are actually applied, the second
> time patch switches to "-R" behaviour and the two fixes cancel each
> other :-(, leaving the kernel source unfixed wrt zlib.
>
> Of course one of the files (182_.. or 183_..) should just be removed
> from the debian/patches directory.
>
> However, I am also of the opinion that the patch options should be
> changed so that such an accident cannot happen, e.g. like
>
> --- debian/apply.orig Wed Aug 31 14:23:53 2005
> +++ debian/apply Wed Aug 31 14:23:15 2005
> @@ -40,7 +40,7 @@
> apply_patch() {
> patch=$(find_patch $home/$1)
> base=$1
> - if uncompress_patch "$patch" | patch -p1 -s -t --no-backup-if-mismatch;
> then
> + if uncompress_patch "$patch" | patch -p1 -f -t --no-backup-if-mismatch;
> then
> printf "%-${length}s\tOK (+)\n" "$base"
> else
> printf "%-${length}s\tFAIL (+)\n" "$base"
Thanks, I noticed this problem yesterday, but hadn't quite been able to
put my finger on the cause. I'll fix it in SVN ASAP.
--
Horms
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Bug#325871: Two identical zlib patches cancel each other
Package: kernel-source-2.4.27
Version: 2.4.27-11
Hi,
kernel-source-2.4.27_2.4.27-11.diff.gz contains two identical patches,
182_linux-zlib-fixes.dif and 183_zisofs.diff.
When I do ./debian/rules patch both are actually applied, the second
time patch switches to "-R" behaviour and the two fixes cancel each
other :-(, leaving the kernel source unfixed wrt zlib.
Of course one of the files (182_.. or 183_..) should just be removed
from the debian/patches directory.
However, I am also of the opinion that the patch options should be
changed so that such an accident cannot happen, e.g. like
--- debian/apply.orig Wed Aug 31 14:23:53 2005
+++ debian/applyWed Aug 31 14:23:15 2005
@@ -40,7 +40,7 @@
apply_patch() {
patch=$(find_patch $home/$1)
base=$1
- if uncompress_patch "$patch" | patch -p1 -s -t --no-backup-if-mismatch;
then
+ if uncompress_patch "$patch" | patch -p1 -f -t --no-backup-if-mismatch;
then
printf "%-${length}s\tOK (+)\n" "$base"
else
printf "%-${length}s\tFAIL (+)\n" "$base"
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
