| 1 |
ulm 14/03/29 16:06:44 |
| 2 |
|
| 3 |
Modified: check-reqs.eclass ChangeLog |
| 4 |
Log: |
| 5 |
Move test for MERGE_TYPE from check-reqs_pkg_setup() to check-reqs_run(). |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.15 eclass/check-reqs.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/check-reqs.eclass?rev=1.15&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/check-reqs.eclass?rev=1.15&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/check-reqs.eclass?r1=1.14&r2=1.15 |
| 13 |
|
| 14 |
Index: check-reqs.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/check-reqs.eclass,v |
| 17 |
retrieving revision 1.14 |
| 18 |
retrieving revision 1.15 |
| 19 |
diff -u -r1.14 -r1.15 |
| 20 |
--- check-reqs.eclass 28 Mar 2014 15:08:16 -0000 1.14 |
| 21 |
+++ check-reqs.eclass 29 Mar 2014 16:06:44 -0000 1.15 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2014 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/check-reqs.eclass,v 1.14 2014/03/28 15:08:16 ulm Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/check-reqs.eclass,v 1.15 2014/03/29 16:06:44 ulm Exp $ |
| 27 |
|
| 28 |
# @ECLASS: check-reqs.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -91,8 +91,6 @@ |
| 31 |
check-reqs_pkg_setup() { |
| 32 |
debug-print-function ${FUNCNAME} "$@" |
| 33 |
|
| 34 |
- [[ ${MERGE_TYPE} == binary ]] && return |
| 35 |
- |
| 36 |
check-reqs_prepare |
| 37 |
check-reqs_run |
| 38 |
check-reqs_output |
| 39 |
@@ -132,24 +130,29 @@ |
| 40 |
# some people are *censored* |
| 41 |
unset CHECKREQS_FAILED |
| 42 |
|
| 43 |
- [[ -n ${CHECKREQS_MEMORY} ]] && \ |
| 44 |
- check-reqs_memory \ |
| 45 |
- ${CHECKREQS_MEMORY} |
| 46 |
- |
| 47 |
- [[ -n ${CHECKREQS_DISK_BUILD} ]] && \ |
| 48 |
- check-reqs_disk \ |
| 49 |
- "${T}" \ |
| 50 |
- "${CHECKREQS_DISK_BUILD}" |
| 51 |
- |
| 52 |
- [[ -n ${CHECKREQS_DISK_USR} ]] && \ |
| 53 |
- check-reqs_disk \ |
| 54 |
- "${EROOT}/usr" \ |
| 55 |
- "${CHECKREQS_DISK_USR}" |
| 56 |
- |
| 57 |
- [[ -n ${CHECKREQS_DISK_VAR} ]] && \ |
| 58 |
- check-reqs_disk \ |
| 59 |
- "${EROOT}/var" \ |
| 60 |
- "${CHECKREQS_DISK_VAR}" |
| 61 |
+ # use != in test, because MERGE_TYPE only exists in EAPI 4 and later |
| 62 |
+ if [[ ${MERGE_TYPE} != binary ]]; then |
| 63 |
+ [[ -n ${CHECKREQS_MEMORY} ]] && \ |
| 64 |
+ check-reqs_memory \ |
| 65 |
+ ${CHECKREQS_MEMORY} |
| 66 |
+ |
| 67 |
+ [[ -n ${CHECKREQS_DISK_BUILD} ]] && \ |
| 68 |
+ check-reqs_disk \ |
| 69 |
+ "${T}" \ |
| 70 |
+ "${CHECKREQS_DISK_BUILD}" |
| 71 |
+ fi |
| 72 |
+ |
| 73 |
+ if [[ ${MERGE_TYPE} != buildonly ]]; then |
| 74 |
+ [[ -n ${CHECKREQS_DISK_USR} ]] && \ |
| 75 |
+ check-reqs_disk \ |
| 76 |
+ "${EROOT}/usr" \ |
| 77 |
+ "${CHECKREQS_DISK_USR}" |
| 78 |
+ |
| 79 |
+ [[ -n ${CHECKREQS_DISK_VAR} ]] && \ |
| 80 |
+ check-reqs_disk \ |
| 81 |
+ "${EROOT}/var" \ |
| 82 |
+ "${CHECKREQS_DISK_VAR}" |
| 83 |
+ fi |
| 84 |
} |
| 85 |
|
| 86 |
# @FUNCTION: check-reqs_get_mebibytes |
| 87 |
@@ -350,4 +353,3 @@ |
| 88 |
# Internal, do not set yourself. |
| 89 |
CHECKREQS_FAILED="true" |
| 90 |
} |
| 91 |
- |
| 92 |
|
| 93 |
|
| 94 |
|
| 95 |
1.1186 eclass/ChangeLog |
| 96 |
|
| 97 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1186&view=markup |
| 98 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1186&content-type=text/plain |
| 99 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1185&r2=1.1186 |
| 100 |
|
| 101 |
Index: ChangeLog |
| 102 |
=================================================================== |
| 103 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 104 |
retrieving revision 1.1185 |
| 105 |
retrieving revision 1.1186 |
| 106 |
diff -u -r1.1185 -r1.1186 |
| 107 |
--- ChangeLog 28 Mar 2014 15:08:16 -0000 1.1185 |
| 108 |
+++ ChangeLog 29 Mar 2014 16:06:44 -0000 1.1186 |
| 109 |
@@ -1,6 +1,9 @@ |
| 110 |
# ChangeLog for eclass directory |
| 111 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 112 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1185 2014/03/28 15:08:16 ulm Exp $ |
| 113 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1186 2014/03/29 16:06:44 ulm Exp $ |
| 114 |
+ |
| 115 |
+ 29 Mar 2014; Ulrich Müller <ulm@g.o> check-reqs.eclass: |
| 116 |
+ Move test for MERGE_TYPE from check-reqs_pkg_setup() to check-reqs_run(). |
| 117 |
|
| 118 |
28 Mar 2014; Ulrich Müller <ulm@g.o> check-reqs.eclass: |
| 119 |
Output binary prefixes for units according to IEC 80000-13, as calculations |
Archives