From cc2786d9dadf108f067554ed908307611e954859 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 22 Jul 2009 15:09:27 +0000 Subject: Apply patch from Riku Voipio to add support for scratchbox variant. Closes: #536820. r59598 --- functions | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'functions') diff --git a/functions b/functions index 2aecd5d..ae8fd3f 100644 --- a/functions +++ b/functions @@ -730,7 +730,7 @@ extract () { ( ); } in_target_nofail () { - if ! chroot "$TARGET" "$@" 2>/dev/null; then + if ! $CHROOT_CMD "$@" 2>/dev/null; then true fi return 0 @@ -741,7 +741,7 @@ in_target_failmsg () { local msg="$2" local arg="$3" shift; shift; shift - if ! chroot "$TARGET" "$@"; then + if ! $CHROOT_CMD "$@"; then warning "$code" "$msg" "$arg" return 1 fi @@ -749,7 +749,7 @@ in_target_failmsg () { } in_target () { - in_target_failmsg IN_TARGET_FAIL "Failure trying to run: %s" "chroot $TARGET $*" "$@" + in_target_failmsg IN_TARGET_FAIL "Failure trying to run: %s" "$CHROOT_CMD $*" "$@" } ###################################################### standard setup stuff -- cgit v1.2.3