cookutils rev 99

Small improvment to cookorder summary
author Christophe Lincoln <pankso@slitaz.org>
date Sun May 08 23:16:13 2011 +0200 (2011-05-08)
parents 747bd9aaeb63
children 1a728863848d
files cooker
line diff
     1.1 --- a/cooker	Sun May 08 23:05:44 2011 +0200
     1.2 +++ b/cooker	Sun May 08 23:16:13 2011 +0200
     1.3 @@ -99,6 +99,7 @@
     1.4  	echo "Hg wok revision  : $cur"
     1.5  	echo "Pulled revision  : $new"
     1.6  	echo "Check date       : $(date '+%Y-%m-%d %H:%M:%S')"
     1.7 +	echo "Packages to cook : $(cat $commits | wc -l)"
     1.8  }
     1.9  
    1.10  # Scan packages build deps and fill up cookorder list.
    1.11 @@ -137,6 +138,7 @@
    1.12  
    1.13  	# Keep an original cooklist so we do a diff when ordering is finished.
    1.14  	cp -f $cooklist $cooklist.0
    1.15 +	echo "cookorder" > $command
    1.16  	echo -e "\nInitial Cooker order scan"
    1.17  	separator
    1.18  	cook_order_scan
    1.19 @@ -189,7 +191,7 @@
    1.20  Scans executed   : $scan
    1.21  Scan duration    : ${time}s
    1.22  EOT
    1.23 -	separator
    1.24 +	separator && rm -f $command
    1.25  }
    1.26  
    1.27  # Remove blocked (faster this way than grepping before).
    1.28 @@ -356,8 +358,8 @@
    1.29  		done
    1.30  
    1.31  		strip_blocked
    1.32 +		cook_order | tee $LOGS/cookorder.log
    1.33  		echo "Packages to cook: $(cat $cooklist | wc -l)" | log
    1.34 -		cook_order | tee $LOGS/cookorder.log
    1.35  		cook_list ;;
    1.36  	*)
    1.37  		# Default is to cook all commits if not yet running.
    1.38 @@ -418,11 +420,9 @@
    1.39  		done
    1.40  		
    1.41  		# Keep previous commit and discard duplicate lines
    1.42 -		pkgs=$(cat $commits | wc -l)
    1.43  		cat $commits $commits.tmp | sed /"^$"/d > $commits.new
    1.44  		uniq $commits.new > $commits && rm $commits.*
    1.45 -		echo "Packages to cook: $pkgs" | log_commits
    1.46 -		echo "Packages to cook: $pkgs" | log
    1.47 +		echo "Packages to cook: $(cat $commits | wc -l)" | log
    1.48  		separator | log_commits
    1.49  		echo ""
    1.50  		strip_blocked