cookutils rev 584 slitaz-tank

Update cooker usage and add better error detection.
author Christopher Rogers <slaxemulator@gmail.com>
date Fri Feb 01 23:46:34 2013 +0000 (2013-02-01)
parents 473a1edbcab0
children 3c62961c30e1
files cook cooker
line diff
     1.1 --- a/cook	Fri Jan 18 16:25:15 2013 +0000
     1.2 +++ b/cook	Fri Feb 01 23:46:34 2013 +0000
     1.3 @@ -821,7 +821,7 @@
     1.4  		echo -e "ERROR: cook failed" | tee -a $LOGS/$pkg.log
     1.5  	fi
     1.6  	# ERROR can be echoed any time in cookit()
     1.7 -	if fgrep -q ERROR: $LOGS/$pkg.log; then
     1.8 +	if grep -Eq '(ERROR:|undefined reference to)' $LOGS/$pkg.log; then
     1.9  		debug_info | tee -a $LOGS/$pkg.log
    1.10  		rm -f $command && exit 1
    1.11  	fi
    1.12 @@ -851,7 +851,7 @@
    1.13  	fi
    1.14  
    1.15  	# First QA check to stop now if genpkg_rules failed.
    1.16 -	if fgrep -q ERROR: $LOGS/$pkg.log; then
    1.17 +	if grep -Eq '(^ERROR|No such file or directory)' $LOGS/$pkg.log; then
    1.18  		broken && exit 1
    1.19  	fi
    1.20  
    1.21 @@ -949,7 +949,7 @@
    1.22  	#status
    1.23  
    1.24  	# Exit if any error found in log file.
    1.25 -	if fgrep -q ERROR: $LOGS/$pkg.log; then
    1.26 +	if grep -Eq '(^ERROR|No such file or directory)' $LOGS/$pkg.log; then
    1.27  		rm -f $command && exit 1
    1.28  	fi
    1.29  
     2.1 --- a/cooker	Fri Jan 18 16:25:15 2013 +0000
     2.2 +++ b/cooker	Fri Feb 01 23:46:34 2013 +0000
     2.3 @@ -40,6 +40,14 @@
     2.4    cat|-c          $(gettext "Cook all packages of a category.")
     2.5    rev|-r          $(gettext "Cook packages of a specific revision.")
     2.6    all|-a          $(gettext "Find and cook all unbuilt packages.")
     2.7 +  cook commands:
     2.8 +  upwok           $(gettext "Update wok.")
     2.9 +  new             $(gettext "Create a new package with a receipt.")
    2.10 +  gen-wok-db      $(gettext "Build cook order files.")
    2.11 +  gen-src         $(gettext "Build source list.")
    2.12 +  check-incoming  $(gettext "Move incoming packages to packages folder.")
    2.13 +  pkgdb           $(gettext "Create packages DB lists and flavors.")
    2.14 +  
    2.15  
    2.16  EOT
    2.17  	exit 0