1 |
The current test for MERGE_TYPE in check-reqs_pkg_setup suppresses |
2 |
also the CHECKREQS_DISK_{USR,VAR} checks which are relevant for binary |
3 |
installs. Move the test to check-reqs_run(). |
4 |
|
5 |
Also, don't check install disk space requirements if building a binpkg |
6 |
without installing it. |
7 |
|
8 |
|
9 |
--- check-reqs.eclass 19 Oct 2012 03:35:15 -0000 1.13 |
10 |
+++ check-reqs.eclass 27 Mar 2014 22:27:27 -0000 |
11 |
@@ -91,8 +91,6 @@ |
12 |
check-reqs_pkg_setup() { |
13 |
debug-print-function ${FUNCNAME} "$@" |
14 |
|
15 |
- [[ ${MERGE_TYPE} == binary ]] && return |
16 |
- |
17 |
check-reqs_prepare |
18 |
check-reqs_run |
19 |
check-reqs_output |
20 |
@@ -132,24 +130,29 @@ |
21 |
# some people are *censored* |
22 |
unset CHECKREQS_FAILED |
23 |
|
24 |
- [[ -n ${CHECKREQS_MEMORY} ]] && \ |
25 |
- check-reqs_memory \ |
26 |
- ${CHECKREQS_MEMORY} |
27 |
- |
28 |
- [[ -n ${CHECKREQS_DISK_BUILD} ]] && \ |
29 |
- check-reqs_disk \ |
30 |
- "${T}" \ |
31 |
- "${CHECKREQS_DISK_BUILD}" |
32 |
- |
33 |
- [[ -n ${CHECKREQS_DISK_USR} ]] && \ |
34 |
- check-reqs_disk \ |
35 |
- "${EROOT}/usr" \ |
36 |
- "${CHECKREQS_DISK_USR}" |
37 |
- |
38 |
- [[ -n ${CHECKREQS_DISK_VAR} ]] && \ |
39 |
- check-reqs_disk \ |
40 |
- "${EROOT}/var" \ |
41 |
- "${CHECKREQS_DISK_VAR}" |
42 |
+ # use != in test, because MERGE_TYPE only exists in EAPI 4 and later |
43 |
+ if [[ ${MERGE_TYPE} != binary ]]; then |
44 |
+ [[ -n ${CHECKREQS_MEMORY} ]] && \ |
45 |
+ check-reqs_memory \ |
46 |
+ ${CHECKREQS_MEMORY} |
47 |
+ |
48 |
+ [[ -n ${CHECKREQS_DISK_BUILD} ]] && \ |
49 |
+ check-reqs_disk \ |
50 |
+ "${T}" \ |
51 |
+ "${CHECKREQS_DISK_BUILD}" |
52 |
+ fi |
53 |
+ |
54 |
+ if [[ ${MERGE_TYPE} != buildonly ]]; then |
55 |
+ [[ -n ${CHECKREQS_DISK_USR} ]] && \ |
56 |
+ check-reqs_disk \ |
57 |
+ "${EROOT}/usr" \ |
58 |
+ "${CHECKREQS_DISK_USR}" |
59 |
+ |
60 |
+ [[ -n ${CHECKREQS_DISK_VAR} ]] && \ |
61 |
+ check-reqs_disk \ |
62 |
+ "${EROOT}/var" \ |
63 |
+ "${CHECKREQS_DISK_VAR}" |
64 |
+ fi |
65 |
} |
66 |
|
67 |
# @FUNCTION: check-reqs_get_mebibytes |