| 1 |
halcy0n 10/08/22 21:18:04 |
| 2 |
|
| 3 |
Modified: check-reqs.eclass |
| 4 |
Log: |
| 5 |
Actually print out the path that check-reqs is testing; bug #300662 |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.7 eclass/check-reqs.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/check-reqs.eclass?rev=1.7&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/check-reqs.eclass?rev=1.7&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/check-reqs.eclass?r1=1.6&r2=1.7 |
| 13 |
|
| 14 |
Index: check-reqs.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/check-reqs.eclass,v |
| 17 |
retrieving revision 1.6 |
| 18 |
retrieving revision 1.7 |
| 19 |
diff -u -r1.6 -r1.7 |
| 20 |
--- check-reqs.eclass 11 Apr 2008 13:52:55 -0000 1.6 |
| 21 |
+++ check-reqs.eclass 22 Aug 2010 21:18:03 -0000 1.7 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2008 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.6 2008/04/11 13:52:55 zlin Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/check-reqs.eclass,v 1.7 2010/08/22 21:18:03 halcy0n Exp $ |
| 27 |
|
| 28 |
# @ECLASS: check-reqs.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -91,11 +91,11 @@ |
| 31 |
if [[ "$CHECKREQS_ACTION" != "ignore" ]] ; then |
| 32 |
[[ -n "$CHECKREQS_MEMORY" ]] && check_build_memory |
| 33 |
[[ -n "$CHECKREQS_DISK_BUILD" ]] && check_build_disk \ |
| 34 |
- "${T}" "\${T}" "${CHECKREQS_DISK_BUILD}" |
| 35 |
+ "${T}" "${CHECKREQS_DISK_BUILD}" |
| 36 |
[[ -n "$CHECKREQS_DISK_USR" ]] && check_build_disk \ |
| 37 |
- "${ROOT}/usr" "\${ROOT}/usr" "${CHECKREQS_DISK_USR}" |
| 38 |
+ "${ROOT}/usr" "${CHECKREQS_DISK_USR}" |
| 39 |
[[ -n "$CHECKREQS_DISK_VAR" ]] && check_build_disk \ |
| 40 |
- "${ROOT}/var" "\${ROOT}/var" "${CHECKREQS_DISK_VAR}" |
| 41 |
+ "${ROOT}/var" "${CHECKREQS_DISK_VAR}" |
| 42 |
fi |
| 43 |
|
| 44 |
if [[ -n "${CHECKREQS_NEED_SLEEP}" ]] ; then |
| 45 |
@@ -126,11 +126,11 @@ |
| 46 |
if [[ "$CHECKREQS_ACTION" != "ignore" ]] ; then |
| 47 |
[[ -n "$CHECKREQS_MEMORY" ]] && check_build_memory |
| 48 |
[[ -n "$CHECKREQS_DISK_BUILD" ]] && check_build_disk \ |
| 49 |
- "${T}" "\${T}" "${CHECKREQS_DISK_BUILD}" |
| 50 |
+ "${T}" "${CHECKREQS_DISK_BUILD}" |
| 51 |
[[ -n "$CHECKREQS_DISK_USR" ]] && check_build_disk \ |
| 52 |
- "${ROOT}/usr" "\${ROOT}/usr" "${CHECKREQS_DISK_USR}" |
| 53 |
+ "${ROOT}/usr" "${CHECKREQS_DISK_USR}" |
| 54 |
[[ -n "$CHECKREQS_DISK_VAR" ]] && check_build_disk \ |
| 55 |
- "${ROOT}/var" "\${ROOT}/var" "${CHECKREQS_DISK_VAR}" |
| 56 |
+ "${ROOT}/var" "${CHECKREQS_DISK_VAR}" |
| 57 |
fi |
| 58 |
|
| 59 |
[[ -z "${CHECKREQS_NEED_SLEEP}" && -z "${CHECKREQS_NEED_DIE}" ]] |
| 60 |
@@ -163,16 +163,16 @@ |
| 61 |
|
| 62 |
# internal use only! |
| 63 |
check_build_disk() { |
| 64 |
- [[ -z "${3}" ]] && die "Usage: check_build_disk where name needed" |
| 65 |
- check_build_msg_begin "${3}" "MBytes" \ |
| 66 |
- "disk space at ${2}" |
| 67 |
+ [[ -z "${2}" ]] && die "Usage: check_build_disk where name needed" |
| 68 |
+ check_build_msg_begin "${2}" "MBytes" \ |
| 69 |
+ "disk space at ${1}" |
| 70 |
actual_space=$(df -Pm ${1} 2>/dev/null | sed -n \ |
| 71 |
'$s/\(\S\+\s\+\)\{3\}\([0-9]\+\).*/\2/p' 2>/dev/null ) |
| 72 |
if [[ "$?" == "0" && -n "${actual_space}" ]] ; then |
| 73 |
- if [[ ${actual_space} -lt ${3} ]] ; then |
| 74 |
+ if [[ ${actual_space} -lt ${2} ]] ; then |
| 75 |
eend 1 |
| 76 |
- check_build_msg_ick "${3}" "MBytes" \ |
| 77 |
- "disk space at ${2}" |
| 78 |
+ check_build_msg_ick "${2}" "MBytes" \ |
| 79 |
+ "disk space at ${1}" |
| 80 |
else |
| 81 |
eend 0 |
| 82 |
fi |
Archives