cookutils rev 109

cooker: log commted pkgs to cook twice so it's in log and activity
author Christophe Lincoln <pankso@slitaz.org>
date Mon May 09 01:25:58 2011 +0200 (2011-05-09)
parents eabfe0267623
children 56bd34e14775
files cook cooker
line diff
     1.1 --- a/cook	Mon May 09 01:10:29 2011 +0200
     1.2 +++ b/cook	Mon May 09 01:25:58 2011 +0200
     1.3 @@ -240,7 +240,7 @@
     1.4  	cookdate=$(date "+%Y-%m-%d %H:%M")
     1.5  	sec=$time
     1.6  	div=$(($time / 60))
     1.7 -	[ "$div" != 0 ] || min="- ${div}m"
     1.8 +	[ "$div" != 0 ] && min="- ${div}m"
     1.9  	gettext "Summary for:"; echo " $PACKAGE $VERSION"
    1.10  	separator
    1.11  	[ "$prod" ] && echo "Produced   : $prod"
     2.1 --- a/cooker	Mon May 09 01:10:29 2011 +0200
     2.2 +++ b/cooker	Mon May 09 01:25:58 2011 +0200
     2.3 @@ -99,7 +99,6 @@
     2.4  	echo "Hg wok revision  : $cur"
     2.5  	echo "Pulled revision  : $new"
     2.6  	echo "Check date       : $(date '+%Y-%m-%d %H:%M:%S')"
     2.7 -	echo "Packages to cook : $pkgs"
     2.8  }
     2.9  
    2.10  # Scan packages build deps and fill up cookorder list.
    2.11 @@ -420,13 +419,13 @@
    2.12  				echo $pkg >> $commits.tmp
    2.13  			done
    2.14  		done
    2.15 -		pkgs=$(cat $commits | wc -l)
    2.16 -		echo "Packages to cook : $pkgs" | log_commits
    2.17  		
    2.18  		# Keep previous commit and discard duplicate lines
    2.19  		cat $commits $commits.tmp | sed /"^$"/d > $commits.new
    2.20  		uniq $commits.new > $commits && rm $commits.*
    2.21 +		pkgs=$(cat $commits | wc -l)
    2.22  		echo "Packages to cook: $pkgs" | log
    2.23 +		echo "Packages to cook : $pkgs" | log_commits
    2.24  		separator | log_commits
    2.25  		echo ""
    2.26  		strip_blocked