[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Robin H. Johnson (robbat2)]

robbat2     10/04/26 06:44:38

  Modified:             kernel-2.eclass
  Log:
  While working on the libre-sources bug, I noticed that some of the kernel sources ebuilds out there have OKV set, but NOT KV_*, leading kernel_is to always return false. Check all of the variables we need for safety instead.

Revision  Changes    Path
1.226                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.226&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.226&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?r1=1.225&r2=1.226

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.225
retrieving revision 1.226
diff -p -w -b -B -u -u -r1.225 -r1.226
--- kernel-2.eclass	1 Apr 2010 21:12:20 -0000	1.225
+++ kernel-2.eclass	26 Apr 2010 06:44:38 -0000	1.226
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.225 2010/04/01 21:12:20 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.226 2010/04/26 06:44:38 robbat2 Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -247,7 +247,14 @@ detect_version() {
 }
 
 kernel_is() {
-	[[ -z ${OKV} ]] && detect_version
+	# ALL of these should be set before we can safely continue this function.
+	# some of the sources have in the past had only one set.
+	local v n=0
+	for v in OKV KV_{MAJOR,MINOR,PATCH} ; do [[ -z ${!v} ]] && n=1 ; done
+	[[ $n -eq 1 ]] && detect_version
+	unset v n
+
+	# Now we can continue
 	local operator test value x=0 y=0 z=0
 
 	case ${1} in