diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2014-03-29 16:06:44 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2014-03-29 16:06:44 +0000 |
| commit | a279afabfbe80c261ed25fcd69336fe9eef4f10e (patch) | |
| tree | 8deff2e316737516a7cf8883d414d91dfad3ccfb /eclass | |
| parent | Version bump. (diff) | |
| download | historical-a279afabfbe80c261ed25fcd69336fe9eef4f10e.tar.gz historical-a279afabfbe80c261ed25fcd69336fe9eef4f10e.tar.bz2 historical-a279afabfbe80c261ed25fcd69336fe9eef4f10e.zip | |
Move test for MERGE_TYPE from check-reqs_pkg_setup() to check-reqs_run().
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/check-reqs.eclass | 40 |
2 files changed, 25 insertions, 20 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 98a941b50bbe..af0017a39e67 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.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 <ulm@gentoo.org> check-reqs.eclass: + Move test for MERGE_TYPE from check-reqs_pkg_setup() to check-reqs_run(). 28 Mar 2014; Ulrich Müller <ulm@gentoo.org> check-reqs.eclass: Output binary prefixes for units according to IEC 80000-13, as calculations diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass index 87e8427b0e53..d25f42b2d3ee 100644 --- a/eclass/check-reqs.eclass +++ b/eclass/check-reqs.eclass @@ -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() { 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 @@ check-reqs_run() { # some people are *censored* unset CHECKREQS_FAILED - [[ -n ${CHECKREQS_MEMORY} ]] && \ - check-reqs_memory \ - ${CHECKREQS_MEMORY} + # 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}" + [[ -n ${CHECKREQS_DISK_BUILD} ]] && \ + check-reqs_disk \ + "${T}" \ + "${CHECKREQS_DISK_BUILD}" + fi - [[ -n ${CHECKREQS_DISK_USR} ]] && \ - check-reqs_disk \ - "${EROOT}/usr" \ - "${CHECKREQS_DISK_USR}" + 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}" + [[ -n ${CHECKREQS_DISK_VAR} ]] && \ + check-reqs_disk \ + "${EROOT}/var" \ + "${CHECKREQS_DISK_VAR}" + fi } # @FUNCTION: check-reqs_get_mebibytes @@ -350,4 +353,3 @@ check-reqs_unsatisfied() { # Internal, do not set yourself. CHECKREQS_FAILED="true" } - |