cookutils rev 171

cooker: have removed pkgs messages befor (for logs)
author Christophe Lincoln <pankso@slitaz.org>
date Mon May 16 15:43:47 2011 +0200 (2011-05-16)
parents c2aaf8d964ca
children 18a92a268c5c
files cooker
line diff
     1.1 --- a/cooker	Mon May 16 15:36:42 2011 +0200
     1.2 +++ b/cooker	Mon May 16 15:43:47 2011 +0200
     1.3 @@ -410,6 +410,18 @@
     1.4  			separator | log_commits
     1.5  			clean_exit && echo "" && exit 0
     1.6  		fi
     1.7 +
     1.8 +		# We may have deleted packages and files in stuff/
     1.9 +		cd $wok
    1.10 +		for pkg in *
    1.11 +		do
    1.12 +			if [ ! -d "${wok}-hg/$pkg" ]; then
    1.13 +				echo "Removing package: $pkg" | log_commits
    1.14 +				. $wok/$pkg/receipt
    1.15 +				rm -rf $PKGS/$PACKAGE-$VERSION*
    1.16 +				rm -rf $wok/$pkg
    1.17 +			fi
    1.18 +		done
    1.19  		
    1.20  		# Get and display modifications.
    1.21  		cd ${wok}-hg
    1.22 @@ -426,18 +438,6 @@
    1.23  				echo $pkg >> $commits.tmp
    1.24  			done
    1.25  		done
    1.26 -
    1.27 -		# We may have deleted packages and files in stuff/
    1.28 -		cd $wok
    1.29 -		for pkg in *
    1.30 -		do
    1.31 -			if [ ! -d "${wok}-hg/$pkg" ]; then
    1.32 -				echo "Removing package: $pkg" | log_commits
    1.33 -				. $wok/$pkg/receipt
    1.34 -				rm -rf $PKGS/$PACKAGE-$VERSION*
    1.35 -				rm -rf $wok/$pkg
    1.36 -			fi
    1.37 -		done
    1.38  		
    1.39  		# Keep previous commit and discard duplicate lines
    1.40  		cat $commits $commits.tmp | sed /"^$"/d > $commits.new