cookutils rev 56
cook: small fix to cookit() and one more debug info
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Sat May 07 13:54:00 2011 +0200 (2011-05-07) |
parents | bfadcb6fe3ec |
children | a390033afc1c |
files | cook cooker |
line diff
1.1 --- a/cook Sat May 07 13:33:21 2011 +0200 1.2 +++ b/cook Sat May 07 13:54:00 2011 +0200 1.3 @@ -242,7 +242,7 @@ 1.4 echo -e "\nDebug information" 1.5 separator 1.6 echo "Cook date: $(date '+%Y-%m-%d %H:%M')" 1.7 - for error in ERROR "No package" "cp: can't stat" "can't open" 1.8 + for error in ERROR "No package" "cp: can't" "can't open" "can't cd" 1.9 do 1.10 fgrep "$error" $LOGS/$pkg.log 1.11 done 1.12 @@ -401,7 +401,7 @@ 1.13 if grep -q ^compile_rules $receipt; then 1.14 gettext -e "Executing: compile_rules\n" 1.15 [ -d "$src" ] && cd $src 1.16 - compile_rules || (echo "" && exit 1) 1.17 + compile_rules || exit 1 1.18 # Stay compatible with _pkg 1.19 [ -d "$src/_pkg" ] && mv $src/_pkg $install 1.20 # QA: compile_rules success so valid. 1.21 @@ -674,6 +674,7 @@ 1.22 fi 1.23 1.24 # Log and source receipt. 1.25 + echo "Cook started for: <a href='cooker.cgi?pkg=$pkg'>$pkg</a>" | log 1.26 echo "cook:$pkg" > $command 1.27 unset inst 1.28 unset_receipt
2.1 --- a/cooker Sat May 07 13:33:21 2011 +0200 2.2 +++ b/cooker Sat May 07 13:54:00 2011 +0200 2.3 @@ -198,7 +198,6 @@ 2.4 if [ -s "$commits" ]; then 2.5 for pkg in $(cat $commits) 2.6 do 2.7 - echo "Cook started for: <a href='cooker.cgi?pkg=$pkg'>$pkg</a>" | log 2.8 echo "cook:$pkg" > $command 2.9 cook $pkg || broken 2.10 sed -i /^${pkg}$/d $commits 2.11 @@ -211,7 +210,6 @@ 2.12 for pkg in $(cat $cooklist) 2.13 do 2.14 if [ ! -d "$wok/$pkg/install" ]; then 2.15 - echo "Cook started for: <a href='cooker.cgi?pkg=$pkg'>$pkg</a>" | log 2.16 cook $pkg || broken 2.17 sed -i /^${pkg}$/d $cooklist 2.18 fi 2.19 @@ -289,7 +287,6 @@ 2.20 cook_list ;; 2.21 pkg|-p) 2.22 # Same as 'cook pkg' but with log for web interface. 2.23 - echo "Cook started for: <a href='cooker.cgi?pkg=$pkg'>$pkg</a>" | log 2.24 cook $pkg || broken 2.25 empty_command ;; 2.26 cat|-c)