Hi guys,
i found the painfull way that kernel eclass does not die if it fails to
unpack patch file supplied to it.

So i propose the patch i attach for inclusion :)

Result with this patch:
>>> Unpacking source...
>>> Unpacking linux-2.6.35.tar.bz2 to
/var/tmp/portage/sys-kernel/tuxonice-sources-2.6.35-r2/work
>>> Unpacking genpatches-2.6.35-8.base.tar.bz2 to
/var/tmp/portage/sys-kernel/tuxonice-sources-2.6.35-r2/work/patches/000001
>>> Unpacking genpatches-2.6.35-8.extras.tar.bz2 to
/var/tmp/portage/sys-kernel/tuxonice-sources-2.6.35-r2/work/patches/000002
bzip2:
/var/tmp/portage/sys-kernel/tuxonice-sources-2.6.35-r2/distdir/tuxonice-3.2-rc2-for-2.6.35.patch.bz2
is not a bzip2 file.
 * ERROR: sys-kernel/tuxonice-sources-2.6.35-r2 failed:
 *   uncompressing patch failed

Without patch:
patchfile gets ignored and you might fail to notice it (as it happened
to me since i use different workbox and commit box and upstream gladly
for fetching returns html code instead of good old 404).

Cheers

Tomas
Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.240
diff -u -b -B -r1.240 kernel-2.eclass
--- kernel-2.eclass     3 Aug 2010 18:31:08 -0000       1.240
+++ kernel-2.eclass     17 Sep 2010 19:40:03 -0000
@@ -870,9 +870,9 @@
                                        PATCH_ORDER="${z}${STRICT_COUNT}"
 
                                        mkdir -p ${KPATCH_DIR}/${PATCH_ORDER}/
-                                       $(${PIPE_CMD} ${i} > 
${KPATCH_DIR}/${PATCH_ORDER}/${x}.patch${PATCH_LEVEL})
+                                       $(${PIPE_CMD} ${i} > 
${KPATCH_DIR}/${PATCH_ORDER}/${x}.patch${PATCH_LEVEL}) || die "uncompressing 
patch failed"
                                else
-                                       $(${PIPE_CMD} ${i} > 
${KPATCH_DIR}/${x}.patch${PATCH_LEVEL})
+                                       $(${PIPE_CMD} ${i} > 
${KPATCH_DIR}/${x}.patch${PATCH_LEVEL}) || die "uncompressing patch failed"
                                fi
                        fi
                fi

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to