On Mon, 16 Nov 2015 23:38:08 +0000 (UTC) "Mike Pagano" <mpag...@gentoo.org> wrote:
> commit: aac24917ebe254a23990f0d7fff9f6f570b99d15 > Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> > AuthorDate: Mon Nov 16 23:37:55 2015 +0000 > Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> > CommitDate: Mon Nov 16 23:37:55 2015 +0000 > URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aac24917 > > kernel-2.eclass: Fix for git-sources 4.4_rcX > > eclass/kernel-2.eclass | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass > index 0f47b8c..5a9ea9f 100644 > --- a/eclass/kernel-2.eclass > +++ b/eclass/kernel-2.eclass > @@ -1079,9 +1079,9 @@ unipatch() { > # https://bugs.gentoo.org/show_bug.cgi?id=507656 > # > > #################################################################### > if [[ ${PN} == "git-sources" ]] ; then > - if [[ ${KV_MAJOR}${KV_PATCH} -ge 315 && > ${RELEASETYPE} == -rc ]] ; then > + if [[ ${KV_MAJOR}.${KV_PATCH} > 3.15 && > ${RELEASETYPE} == -rc ]] ; then Don't do string comparison on numbers. It can fail randomly, and teaches others who read it bad practices. For example, it would fail when kernel reaches version 10 ;-P. Instead: [[ ${KV_MAJOR} -gt 3 || ( ${KV_MAJOR} -eq 3 && ${KV_PATCH} -gt 15 ) ]] > ebegin "Applying ${i/*\//} (-p1)" > - if [ $(patch -p1 > --no-backup-if-mismatch -f < ${i} >> ${STDERR_T}) "$?" -eq 0 ]; then > + if [ $(patch -p1 > --no-backup-if-mismatch -f < ${i} >> ${STDERR_T}) "$?" -le 2 ]; then > eend 0 > rm ${STDERR_T} > break > -- Best regards, Michał Górny <http://dev.gentoo.org/~mgorny/>
pgpMQltjFzfDQ.pgp
Description: OpenPGP digital signature
