diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2014-08-10 10:02:43 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2014-08-10 10:02:43 +0000 |
| commit | 6a6072a85ba0433d69f361af49e9032bf54af291 (patch) | |
| tree | 87890fb35049e4ddef872fd5ddf1cd738e7de526 /eclass | |
| parent | Version bump. Add USE=selinux. (diff) | |
| download | gentoo-2-6a6072a85ba0433d69f361af49e9032bf54af291.tar.gz gentoo-2-6a6072a85ba0433d69f361af49e9032bf54af291.tar.bz2 gentoo-2-6a6072a85ba0433d69f361af49e9032bf54af291.zip | |
Check for earlier version, not different version (bug #519558 by kavol).
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/nvidia-driver.eclass | 46 |
2 files changed, 28 insertions, 23 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 7e1ff1916c0e..1814fa6b9b3d 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1347 2014/08/10 05:47:25 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1348 2014/08/10 10:02:43 jer Exp $ + + 10 Aug 2014; Jeroen Roovers <jer@gentoo.org> nvidia-driver.eclass: + Check for earlier version, not different version (bug #519558 by kavol). 10 Aug 2014; Robin H. Johnson <robbat2@gentoo.org> mysql-v2.eclass: Add extra download URL from overlay. diff --git a/eclass/nvidia-driver.eclass b/eclass/nvidia-driver.eclass index 70efb7849521..89ffcdce8028 100644 --- a/eclass/nvidia-driver.eclass +++ b/eclass/nvidia-driver.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/nvidia-driver.eclass,v 1.24 2014/08/08 12:13:38 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/nvidia-driver.eclass,v 1.25 2014/08/10 10:02:43 jer Exp $ # @ECLASS: nvidia-driver.eclass # @MAINTAINER: @@ -66,7 +66,6 @@ drv_304x=" 03d2 03d5 03d6 0531 0533 053a 053b 053e 07e0 07e1 07e2 07e3 07e5 " - drv_340x=" 0191 0193 0194 0197 019d 019e 0400 0401 0402 0403 0404 0405 0406 0407 0408 0409 040a 040b 040c 040d 040e 040f 0410 0420 0421 0422 0423 0424 0425 0426 @@ -162,25 +161,28 @@ nvidia-driver-get-mask() { nvidia-driver-check-warning() { local NVIDIA_MASK="$(nvidia-driver-get-mask)" - if [ -n "${NVIDIA_MASK}" ] && ! version_compare "${NVIDIA_MASK##*-}" "${PV}"; then - ewarn "***** WARNING *****" - ewarn - ewarn "You are currently installing a version of nvidia-drivers that is" - ewarn "known not to work with a video card you have installed on your" - ewarn "system. If this is intentional, please ignore this. If it is not" - ewarn "please perform the following steps:" - ewarn - ewarn "Add the following mask entry to /etc/portage/package.mask by" - if [ -d "${ROOT}/etc/portage/package.mask" ]; then - ewarn "echo \"${NVIDIA_MASK}\" > /etc/portage/package.mask/nvidia-drivers" - else - ewarn "echo \"${NVIDIA_MASK}\" >> /etc/portage/package.mask" + if [ -n "${NVIDIA_MASK}" ]; then + version_compare "${NVIDIA_MASK##*-}" "${PV}" + if [ x"${?}" = x1 ]; then + ewarn "***** WARNING *****" + ewarn + ewarn "You are currently installing a version of nvidia-drivers that is" + ewarn "known not to work with a video card you have installed on your" + ewarn "system. If this is intentional, please ignore this. If it is not" + ewarn "please perform the following steps:" + ewarn + ewarn "Add the following mask entry to /etc/portage/package.mask by" + if [ -d "${ROOT}/etc/portage/package.mask" ]; then + ewarn "echo \"${NVIDIA_MASK}\" > /etc/portage/package.mask/nvidia-drivers" + else + ewarn "echo \"${NVIDIA_MASK}\" >> /etc/portage/package.mask" + fi + ewarn + ewarn "Failure to perform the steps above could result in a non-working" + ewarn "X setup." + ewarn + ewarn "For more information please read:" + ewarn "http://www.nvidia.com/object/IO_32667.html" fi - ewarn - ewarn "Failure to perform the steps above could result in a non-working" - ewarn "X setup." - ewarn - ewarn "For more information please read:" - ewarn "http://www.nvidia.com/object/IO_32667.html" fi } |