# HG changeset patch
# User Antoine Bodin <gokhlayeh@slitaz.org>
# Date 1301879144 -7200
# Node ID 789cd6566f3a1b3b244e7c0fa9283c4bb1cd0610
# Parent  70132bd3161db8fb119dc43983907db393ed05d0# Parent  c545a19df5b5c142f22ccee13b3bcb7f46d81bed
Merge bugfixes from default

diff -r 70132bd3161d -r 789cd6566f3a chroot-scripts/gen-iso
--- a/chroot-scripts/gen-iso	Sat Apr 02 14:47:30 2011 +0200
+++ b/chroot-scripts/gen-iso	Mon Apr 04 03:05:44 2011 +0200
@@ -29,7 +29,7 @@
 	sed "/^ISO_NAME/ s/$1/$SLITAZ_VERSION-$1/" -i tazlito.conf
 	[ "$2" = gzip ] && echo "COMPRESSION=gzip" >> tazlito.conf
 	echo -e "\n" | tazlito gen-distro || report exit "Generation of iso failed"
-	cp $SLITAZ_DIR/distro/*.iso $SLITAZ_DIR/distro/*.md5 $LOCAL_REPOSITORY/iso
+	cp $LOCAL_REPOSITORY/distro/*.iso $LOCAL_REPOSITORY/distro/*.md5 $LOCAL_REPOSITORY/iso
 	clean-chroot
 	report stop
 else
diff -r 70132bd3161d -r 789cd6566f3a tazwok
--- a/tazwok	Sat Apr 02 14:47:30 2011 +0200
+++ b/tazwok	Mon Apr 04 03:05:44 2011 +0200
@@ -1909,9 +1909,9 @@
 		cat $tmp/dep | sort -u
 	fi
 	rm -f $tmp/dep $tmp/list
+	sort -o $dep_db $dep_db
+	sort -o $wan_db $wan_db
 	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
 }
@@ -2845,9 +2845,9 @@
 		db_md5=$(md5sum $dep_db $wan_db)
 		update_wan_db
 		check_for_commit
+		sort -o $dep_db $dep_db
+		sort -o $wan_db $wan_db
 		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