cookutils diff cook @ rev 47

cook: Let handle blocked pkgs in 3 lines also used by the Cooker
author Christophe Lincoln <pankso@slitaz.org>
date Sat May 07 04:38:51 2011 +0200 (2011-05-07)
parents 7fc260d77233
children 8df3646e9d8f
line diff
     1.1 --- a/cook	Sat May 07 04:04:37 2011 +0200
     1.2 +++ b/cook	Sat May 07 04:38:51 2011 +0200
     1.3 @@ -14,6 +14,7 @@
     1.4  activity="$CACHE/activity"
     1.5  command="$CACHE/command"
     1.6  broken="$CACHE/broken"
     1.7 +blocked="$CACHE/blocked"
     1.8  
     1.9  #
    1.10  # Functions
    1.11 @@ -334,7 +335,8 @@
    1.12  	if [ "$free" -lt 524288 ] && [ "$CFLAGS" != "${CFLAGS/-pipe}" ]; then
    1.13  			gettext -e "Disabling -pipe compile flag: $free RAM\n"
    1.14  			CFLAGS="${CFLAGS/-pipe}" && CFLAGS=$(echo "$CFLAGS" | tr -s ' ')
    1.15 -			CXXFLAGS="${CXXFLAGS/-pipe}" && CXXFLAGS=$(echo "$CXXFLAGS" | tr -s ' ')
    1.16 +			CXXFLAGS="${CXXFLAGS/-pipe}" && \
    1.17 +				CXXFLAGS=$(echo "$CXXFLAGS" | tr -s ' ')
    1.18  	fi
    1.19  	unset free
    1.20  
    1.21 @@ -655,6 +657,13 @@
    1.22  		[ -z "$pkg" ] && usage
    1.23  		receipt="$WOK/$pkg/receipt"
    1.24  		check_pkg_in_wok && echo ""
    1.25 +
    1.26 +		# Skip blocked, 3 lines also for the Cooker.
    1.27 +		if grep -q ^$pkg$ $blocked; then
    1.28 +			gettext -e "Blocked package:"; echo -e " $pkg\n" && exit 0
    1.29 +		fi
    1.30 +
    1.31 +		# Log and source receipt.
    1.32  		echo "cook:$pkg" > $command
    1.33  		unset inst
    1.34  		unset_receipt