# HG changeset patch
# User Antoine Bodin <gokhlayeh@slitaz.org>
# Date 1301748450 -7200
# Node ID 70132bd3161db8fb119dc43983907db393ed05d0
# Parent  15c8e63c3091998c25a8641c318aafcd1e310c0a# Parent  2b0f1826a1192c5bdee4f3cca22cd9d0ba024f50
Merge bugfixes from default

diff -r 15c8e63c3091 -r 70132bd3161d .hgtags
--- a/.hgtags	Fri Apr 01 04:47:00 2011 +0200
+++ b/.hgtags	Sat Apr 02 14:47:30 2011 +0200
@@ -23,3 +23,4 @@
 bf449151a34258e71f7ec0868f3e521d22995817 4.2.6
 ff412a1044b097a7fb095d22081245fbcb00a187 4.2.7
 7e7265ac0dc0858705f369998a140298c753854b 4.2.8
+6860bdd720318dfe2cfd5d72b18ee694ffbd30d7 4.2.9
diff -r 15c8e63c3091 -r 70132bd3161d tazwok
--- a/tazwok	Fri Apr 01 04:47:00 2011 +0200
+++ b/tazwok	Sat Apr 02 14:47:30 2011 +0200
@@ -720,8 +720,9 @@
 		[ "$src" ] || set_src_path
 		[ "$DESTDIR" ] || DESTDIR="$WOK/$PACKAGE/install"
 		[ "$CONFIG_SITE" ] || CONFIG_SITE=/etc/config.site
-		export CFLAGS CXXFLAGS MAKEFLAGS DESTDIR BUILD_HOST \
-			CONFIG_SITE default_prefix \
+		export CFLAGS=$(echo "$CFLAGS" | tr -s ' ') \
+			CXXFLAGS=$(echo "$CXXFLAGS" | tr -s ' ') \
+			MAKEFLAGS DESTDIR BUILD_HOST CONFIG_SITE default_prefix \
 			default_datarootdir default_datadir default_localedir \
 			default_infodir default_mandir default_build default_host
 		local LC_ALL=POSIX LANG=POSIX
@@ -1555,18 +1556,13 @@
 
 gen_wan_db()
 {
+	rm -f $wan_db
 	for RECEIPT in $(fgrep -l WANTED $WOK/*/receipt); do
 		WANTED=
 		source $RECEIPT
 		[ "$WANTED" ] || continue
-		echo -e $PACKAGE"\t"$WANTED >> $tmp/wan_db
+		echo -e $PACKAGE"\t"$WANTED >> $wan_db
 	done
-	if ! [ -f $wan_db ] || [ "$(diff -q $tmp/wan_db $wan_db)" ]; then
-		mv -f $tmp/wan_db $wan_db
-		plan_regen_cookorder=yes
-	else
-		rm $tmp/wan_db
-	fi
 }
 
 update_wan_db()
@@ -1576,30 +1572,21 @@
 	grep $'\t'$PACKAGE $wan_db | cut -f 1 | while read wan; do
 		echo "$wanted_list" | fgrep -q /$wan/receipt && continue
 		sed "/^$wan\t/d" -i $wan_db
-		plan_regen_cookorder=yes
 	done 
 	for RECEIPT in $wanted_list; do
-		WANTED=
+		unset WANTED PACKAGE
 		source $RECEIPT
 		[ "$WANTED" ] || continue
-		wan_info=$(echo -e $PACKAGE"\t"$WANTED)
-		[ "$wan_info" = "$(grep -m1 ^$PACKAGE$'\t' $wan_db 2>/dev/null)" ] && continue
 		sed "/^$PACKAGE\t/d" -i $wan_db
-		echo "$wan_info" >> $wan_db
-		plan_regen_cookorder=yes
-		plan_sort_wandb=yes
+		echo -e $PACKAGE"\t"$WANTED >> $wan_db
 	done
 	unset wanted_list
 }
 
 update_dep_db()
 {
-	dep_info=$(echo -e $PACKAGE"\t "$DEPENDS" \t "$BUILD_DEPENDS' ')
-	[ "$dep_info" = "$(grep -m1 ^$PACKAGE$'\t' $dep_db 2>/dev/null)" ] && return
 	sed "/^$PACKAGE\t/d" -i $dep_db
-	echo "$dep_info" >> $dep_db
-	plan_regen_cookorder=yes
-	plan_sort_depdb=yes
+	echo -e $PACKAGE"\t "$DEPENDS" \t "$BUILD_DEPENDS' ' >> $dep_db
 }
 
 sort_db()
@@ -1642,7 +1629,6 @@
 	done
 
 	tac $tmp/cookorder >> $cookorder
-	unset plan_regen_cookorder
 	report end-step
 }
 
@@ -1834,6 +1820,9 @@
 	local cooklist= look_for= with_dev= with_wanted= with_args= log_command="$0 $@" \
 		get_options_list="look_for with_dev with_wanted with_args cooklist use_wanted"
 	get_options
+
+	# Get db md5 to be able to check for changes latter.
+	db_md5=$(md5sum $dep_db $wan_db)
 	
 	# Cooklist is a special case where we need to modify a little
 	# scan behavior
@@ -1882,7 +1871,6 @@
 					check_for_missing && echo $PACKAGE >> $tmp/dep
 				fi
 			}
-			check_db_status=yes
 			unset plan_check_for_missing
 		fi
 	fi
@@ -1921,13 +1909,10 @@
 		cat $tmp/dep | sort -u
 	fi
 	rm -f $tmp/dep $tmp/list
-	if [ "$check_db_status" ]; then
-		[ "$plan_sort_depdb" ] && sort -o $dep_db $dep_db && unset plan_sort_depdb
-		[ "$plan_sort_wandb" ] && sort -o $wan_db $wan_db && unset plan_sort_wandb
-		if [ "$plan_regen_cookorder" ] && \
-		[ "$(sed 1!d $cookorder)" != "#PlanSort" ]; then
-			grep -q "^#" $cookorder || sed 1i"#PlanSort" -i $cookorder
-		fi
+	if [ "$db_md5" != "$(md5sum $dep_db $wan_db)" ]; then
+		sort -o $dep_db $dep_db
+		sort -o $wan_db $wan_db
+		grep -q "^#" $cookorder || sed 1i"#PlanSort" -i $cookorder
 	fi
 }
 
@@ -2064,10 +2049,8 @@
 {
 	if [ "$(sed 1!d $cookorder)" = "#PlanSort" ]; then
 		sed 1d -i $cookorder
-		plan_regen_cookorder=yes
+		sort_db
 	fi
-	[ "$plan_sort_depdb" ] && sort -o $dep_db $dep_db && unset plan_sort_depdb
-	[ "$plan_regen_cookorder" ] && sort_db
 	report step "Generating cooklist"
 	if [ -f "$tmp/checked" ]; then
 		rm -f $tmp/cooklist
@@ -2859,13 +2842,13 @@
 		get_tazwok_config
 		source_lib report
 		report start
+		db_md5=$(md5sum $dep_db $wan_db)
 		update_wan_db
 		check_for_commit
-		[ "$plan_sort_depdb" ] && sort -o $dep_db $dep_db && unset plan_sort_depdb
-		[ "$plan_sort_wandb" ] && sort -o $wan_db $wan_db && unset plan_sort_wandb
-		if [ "$plan_regen_cookorder" ]; then
-			[ "$(sed 1!d $cookorder)" = "#PlanSort" ] || \
-			sed 1i"#PlanSort" -i $cookorder
+		if [ "$db_md5" != "$(md5sum $dep_db $wan_db)" ]; then
+			sort -o $dep_db $dep_db
+			sort -o $wan_db $wan_db
+			grep -q "^#" $cookorder || sed 1i"#PlanSort" -i $cookorder
 		fi
 		cook
 	;;