ulm 14/03/29 16:06:44 Modified: check-reqs.eclass ChangeLog Log: Move test for MERGE_TYPE from check-reqs_pkg_setup() to check-reqs_run().
Revision Changes Path 1.15 eclass/check-reqs.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/check-reqs.eclass?rev=1.15&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/check-reqs.eclass?rev=1.15&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/check-reqs.eclass?r1=1.14&r2=1.15 Index: check-reqs.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/check-reqs.eclass,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- check-reqs.eclass 28 Mar 2014 15:08:16 -0000 1.14 +++ check-reqs.eclass 29 Mar 2014 16:06:44 -0000 1.15 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/check-reqs.eclass,v 1.14 2014/03/28 15:08:16 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/check-reqs.eclass,v 1.15 2014/03/29 16:06:44 ulm Exp $ # @ECLASS: check-reqs.eclass # @MAINTAINER: @@ -91,8 +91,6 @@ check-reqs_pkg_setup() { debug-print-function ${FUNCNAME} "$@" - [[ ${MERGE_TYPE} == binary ]] && return - check-reqs_prepare check-reqs_run check-reqs_output @@ -132,24 +130,29 @@ # some people are *censored* unset CHECKREQS_FAILED - [[ -n ${CHECKREQS_MEMORY} ]] && \ - check-reqs_memory \ - ${CHECKREQS_MEMORY} - - [[ -n ${CHECKREQS_DISK_BUILD} ]] && \ - check-reqs_disk \ - "${T}" \ - "${CHECKREQS_DISK_BUILD}" - - [[ -n ${CHECKREQS_DISK_USR} ]] && \ - check-reqs_disk \ - "${EROOT}/usr" \ - "${CHECKREQS_DISK_USR}" - - [[ -n ${CHECKREQS_DISK_VAR} ]] && \ - check-reqs_disk \ - "${EROOT}/var" \ - "${CHECKREQS_DISK_VAR}" + # use != in test, because MERGE_TYPE only exists in EAPI 4 and later + if [[ ${MERGE_TYPE} != binary ]]; then + [[ -n ${CHECKREQS_MEMORY} ]] && \ + check-reqs_memory \ + ${CHECKREQS_MEMORY} + + [[ -n ${CHECKREQS_DISK_BUILD} ]] && \ + check-reqs_disk \ + "${T}" \ + "${CHECKREQS_DISK_BUILD}" + fi + + if [[ ${MERGE_TYPE} != buildonly ]]; then + [[ -n ${CHECKREQS_DISK_USR} ]] && \ + check-reqs_disk \ + "${EROOT}/usr" \ + "${CHECKREQS_DISK_USR}" + + [[ -n ${CHECKREQS_DISK_VAR} ]] && \ + check-reqs_disk \ + "${EROOT}/var" \ + "${CHECKREQS_DISK_VAR}" + fi } # @FUNCTION: check-reqs_get_mebibytes @@ -350,4 +353,3 @@ # Internal, do not set yourself. CHECKREQS_FAILED="true" } - 1.1186 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1186&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1186&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1185&r2=1.1186 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1185 retrieving revision 1.1186 diff -u -r1.1185 -r1.1186 --- ChangeLog 28 Mar 2014 15:08:16 -0000 1.1185 +++ ChangeLog 29 Mar 2014 16:06:44 -0000 1.1186 @@ -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.1185 2014/03/28 15:08:16 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1186 2014/03/29 16:06:44 ulm Exp $ + + 29 Mar 2014; Ulrich Müller <[email protected]> check-reqs.eclass: + Move test for MERGE_TYPE from check-reqs_pkg_setup() to check-reqs_run(). 28 Mar 2014; Ulrich Müller <[email protected]> check-reqs.eclass: Output binary prefixes for units according to IEC 80000-13, as calculations
