SliTaz Repositories

     1.1 --- a/cook	Mon May 09 02:23:39 2011 +0200
     1.2 +++ b/cook	Mon May 09 02:45:13 2011 +0200
     1.3 @@ -347,10 +347,10 @@
     1.4  # Remove installed deps.
     1.5  remove_deps() {
     1.6  	# Now remove installed build deps.
     1.7 -	diff="$CACHE/installed.diff"
     1.8 -	deps=$(cat $diff | grep ^+[a-zA-Z0-9] | sed s/^+//)
     1.9 -	nb=$(cat $diff | grep ^+[a-zA-Z0-9] | wc -l)
    1.10 -	if [ -s "$CACHE/installed.diff" ]; then
    1.11 +	diff="$CACHE/installed.cook.diff"
    1.12 +	if [ -s "$CACHE/installed.cook.diff" ]; then
    1.13 +		deps=$(cat $diff | grep ^+[a-zA-Z0-9] | sed s/^+//)
    1.14 +		nb=$(cat $diff | grep ^+[a-zA-Z0-9] | wc -l)
    1.15  		gettext "Build dependencies to remove:"; echo " $nb"
    1.16  		gettext "Removing:"
    1.17  		for dep in $deps
    1.18 @@ -359,7 +359,8 @@
    1.19  			yes | tazpkg remove $dep >/dev/null
    1.20  		done
    1.21  		echo -e "\n"
    1.22 -		mv -f $CACHE/installed.diff $CACHE/installed.last.diff
    1.23 +		# Keep the last diff for debug and info.
    1.24 +		mv -f $CACHE/installed.cook.diff $CACHE/installed.diff
    1.25  	fi
    1.26  }
    1.27  
    1.28 @@ -406,9 +407,9 @@
    1.29  	ls -1 > $CACHE/installed.cook && cd $CACHE
    1.30  	
    1.31  	# If a cook failed deps are not removed since we exit 1.
    1.32 -	[ ! -s "installed.diff" ] && \
    1.33 -		diff installed.list installed.cook > installed.diff
    1.34 -	deps=$(cat installed.diff | grep ^+[a-zA-Z0-9] | wc -l)
    1.35 +	[ ! -s "installed.cook.diff" ] && \
    1.36 +		diff installed.list installed.cook > installed.cook.diff
    1.37 +	deps=$(cat installed.cook.diff | grep ^+[a-zA-Z0-9] | wc -l)
    1.38  
    1.39  	# Get source tarball and make sure we have source dir named:
    1.40  	# $PACKAGE-$VERSION to be standard in receipts. Here we use tar.lzma