diff options
| author |   Mark Loeser <halcy0n@gentoo.org> | 2010-08-22 21:18:03 +0000 |
|---|---|---|
| committer | Mark Loeser <halcy0n@gentoo.org> | 2010-08-22 21:18:03 +0000 |
| commit | 2778f53051bc8aef5ee9fc6bf21db568fc2fd8b3 (patch) | |
| tree | ae058fcb9f297158bc95982255209d987dcf2d24 /eclass | |
| parent | add E{CVS,SCM}_VERSION support #333773 by Michał Górny (diff) | |
| download | gentoo-2-2778f53051bc8aef5ee9fc6bf21db568fc2fd8b3.tar.gz gentoo-2-2778f53051bc8aef5ee9fc6bf21db568fc2fd8b3.tar.bz2 gentoo-2-2778f53051bc8aef5ee9fc6bf21db568fc2fd8b3.zip | |
Actually print out the path that check-reqs is testing; bug #300662
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/check-reqs.eclass | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass index c21be0dc365e..26b5f8de784b 100644 --- a/eclass/check-reqs.eclass +++ b/eclass/check-reqs.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/check-reqs.eclass,v 1.6 2008/04/11 13:52:55 zlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/check-reqs.eclass,v 1.7 2010/08/22 21:18:03 halcy0n Exp $ # @ECLASS: check-reqs.eclass # @MAINTAINER: @@ -91,11 +91,11 @@ check_reqs() { if [[ "$CHECKREQS_ACTION" != "ignore" ]] ; then [[ -n "$CHECKREQS_MEMORY" ]] && check_build_memory [[ -n "$CHECKREQS_DISK_BUILD" ]] && check_build_disk \ - "${T}" "\${T}" "${CHECKREQS_DISK_BUILD}" + "${T}" "${CHECKREQS_DISK_BUILD}" [[ -n "$CHECKREQS_DISK_USR" ]] && check_build_disk \ - "${ROOT}/usr" "\${ROOT}/usr" "${CHECKREQS_DISK_USR}" + "${ROOT}/usr" "${CHECKREQS_DISK_USR}" [[ -n "$CHECKREQS_DISK_VAR" ]] && check_build_disk \ - "${ROOT}/var" "\${ROOT}/var" "${CHECKREQS_DISK_VAR}" + "${ROOT}/var" "${CHECKREQS_DISK_VAR}" fi if [[ -n "${CHECKREQS_NEED_SLEEP}" ]] ; then @@ -126,11 +126,11 @@ check_reqs_conditional() { if [[ "$CHECKREQS_ACTION" != "ignore" ]] ; then [[ -n "$CHECKREQS_MEMORY" ]] && check_build_memory [[ -n "$CHECKREQS_DISK_BUILD" ]] && check_build_disk \ - "${T}" "\${T}" "${CHECKREQS_DISK_BUILD}" + "${T}" "${CHECKREQS_DISK_BUILD}" [[ -n "$CHECKREQS_DISK_USR" ]] && check_build_disk \ - "${ROOT}/usr" "\${ROOT}/usr" "${CHECKREQS_DISK_USR}" + "${ROOT}/usr" "${CHECKREQS_DISK_USR}" [[ -n "$CHECKREQS_DISK_VAR" ]] && check_build_disk \ - "${ROOT}/var" "\${ROOT}/var" "${CHECKREQS_DISK_VAR}" + "${ROOT}/var" "${CHECKREQS_DISK_VAR}" fi [[ -z "${CHECKREQS_NEED_SLEEP}" && -z "${CHECKREQS_NEED_DIE}" ]] @@ -163,16 +163,16 @@ check_build_memory() { # internal use only! check_build_disk() { - [[ -z "${3}" ]] && die "Usage: check_build_disk where name needed" - check_build_msg_begin "${3}" "MBytes" \ - "disk space at ${2}" + [[ -z "${2}" ]] && die "Usage: check_build_disk where name needed" + check_build_msg_begin "${2}" "MBytes" \ + "disk space at ${1}" actual_space=$(df -Pm ${1} 2>/dev/null | sed -n \ '$s/\(\S\+\s\+\)\{3\}\([0-9]\+\).*/\2/p' 2>/dev/null ) if [[ "$?" == "0" && -n "${actual_space}" ]] ; then - if [[ ${actual_space} -lt ${3} ]] ; then + if [[ ${actual_space} -lt ${2} ]] ; then eend 1 - check_build_msg_ick "${3}" "MBytes" \ - "disk space at ${2}" + check_build_msg_ick "${2}" "MBytes" \ + "disk space at ${1}" else eend 0 fi |