kernel-2.eclass: use experimental in global scope
authorRobin H. Johnson <robbat2@gentoo.org>
Sun, 22 Nov 2015 23:39:06 +0000 (15:39 -0800)
committerRobin H. Johnson <robbat2@gentoo.org>
Sun, 22 Nov 2015 23:40:55 +0000 (15:40 -0800)
Per bug #566520, use experimental is being called in global scope (via
detect_version -> handle_genpatches).

This should NOT trigger the experimental patches being applied with
USE=-experimental, but further testing is needed.

X-Gentoo-Bug: #566520
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
eclass/kernel-2.eclass

index 1a508f119aafd46d2b55b9483713c17022459e1b..c6223238e7f67dc97ebd3091cdf4028f991bc036 100644 (file)
@@ -160,15 +160,9 @@ handle_genpatches() {
                if [[ "${i}" == "experimental" && -z ${K_EXP_GENPATCHES_PULL} && -z ${K_EXP_GENPATCHES_NOUSE} ]] ; then
                        use_cond_start="experimental? ( "
                        use_cond_end=" )"
-
-                       if use experimental ; then
-                               UNIPATCH_LIST_GENPATCHES+=" ${DISTDIR}/${tarball}"
-                               debug-print "genpatches tarball: $tarball"
-                       fi
-               else
-                       UNIPATCH_LIST_GENPATCHES+=" ${DISTDIR}/${tarball}"
-                       debug-print "genpatches tarball: $tarball"
                fi
+               UNIPATCH_LIST_GENPATCHES+=" ${DISTDIR}/${tarball}"
+               debug-print "genpatches tarball: $tarball"
                GENPATCHES_URI+=" ${use_cond_start}mirror://gentoo/${tarball}${use_cond_end}"
        done
 }