cookutils rev 107

cooker: dont strip out a WNATED pkg if its parent is not also in cooklist
author Christophe Lincoln <pankso@slitaz.org>
date Mon May 09 01:05:14 2011 +0200 (2011-05-09)
parents b5dc1fba0894
children eabfe0267623
files cooker
line diff
     1.1 --- a/cooker	Mon May 09 00:53:48 2011 +0200
     1.2 +++ b/cooker	Mon May 09 01:05:14 2011 +0200
     1.3 @@ -115,7 +115,6 @@
     1.4  		do
     1.5  			if grep -q "^$dep$" $cooklist; then
     1.6  				if ! grep -q "^$dep$" $cookorder; then
     1.7 -					
     1.8  					echo "$dep" >> $cookorder
     1.9  				fi
    1.10  			fi
    1.11 @@ -163,7 +162,7 @@
    1.12  	diff $cooklist.0 $cooklist > $cooklist.diff
    1.13  	rm -f $cookorder $cookorder.diff $cooklist.0
    1.14  
    1.15 -	# Scan is finished: append pkg to WANTED
    1.16 +	# Scan finished: append pkg to WANTED or leave it in the ordered cooklist.
    1.17  	echo -e "\nHandle WANTED package"
    1.18  	separator
    1.19  	for pkg in $(cat $cooklist)
    1.20 @@ -172,8 +171,10 @@
    1.21  		. $wok/$pkg/receipt
    1.22  		if [ "$WANTED" ]; then
    1.23  			echo "$pkg :: $WANTED"
    1.24 -			sed -i -e "/^$pkg$/"d  \
    1.25 -				-e "/^$WANTED$/ a $pkg"  $cooklist
    1.26 +			if grep ^${WANTED}$ $cooklist; then
    1.27 +				sed -i -e "/^$pkg$/"d  \
    1.28 +					-e "/^$WANTED$/ a $pkg" $cooklist
    1.29 +			fi
    1.30  		fi
    1.31  	done
    1.32