cookutils diff cook @ rev 205
cook: improve missing dep handling
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Sun May 22 16:26:24 2011 +0200 (2011-05-22) |
parents | 307625056072 |
children | 1ae555c8f92c |
line diff
1.1 --- a/cook Sun May 22 15:42:10 2011 +0200 1.2 +++ b/cook Sun May 22 16:26:24 2011 +0200 1.3 @@ -408,7 +408,7 @@ 1.4 for dep in $deps 1.5 do 1.6 echo -n " $dep" 1.7 - yes | tazpkg remove $dep >/dev/null 1.8 + echo 'y' | tazpkg remove $dep >/dev/null 1.9 done 1.10 echo -e "\n" 1.11 # Keep the last diff for debug and info. 1.12 @@ -482,12 +482,15 @@ 1.13 1.14 # Have we missing build dep to cook ? 1.15 if [ -s "$CACHE/missing" ] && [ "$AUTO_COOK" ]; then 1.16 + gettext -e "Auto cook config is set : AUTO_COOK\n" 1.17 cp -f $LOGS/$PACKAGE.log $LOGS/$PACKAGE.log.$$ 1.18 for i in $(cat $CACHE/missing) 1.19 do 1.20 - (gettext "Building dep (wok/pkg):"; echo " $i $vers") | \ 1.21 + (gettext "Building dep (wok/pkg) :"; echo " $i $vers") | \ 1.22 tee -a $LOGS/$PACKAGE.log.$$ 1.23 - cook $i || echo "ERROR: can't cook dep: $i $vers" | \ 1.24 + cook $i || (echo -e "ERROR: can't cook dep '$i'\n" && \ 1.25 + fgrep "remove: " $LOGS/$i.log && \ 1.26 + fgrep "Removing: " $LOGS/$i.log && echo "") | \ 1.27 tee -a $LOGS/$PACKAGE.log.$$ && break 1.28 done 1.29 rm -f $CACHE/missing