From b4145493b0f89624273c7f73d97867ae90f3287c Mon Sep 17 00:00:00 2001
From: Manuel Canales Esparcia <manuel@linuxfromscratch.org>
Date: Thu, 4 May 2006 18:30:06 +0000
Subject: [PATCH] Merged r2630 and r2631 from trunk.

---
 common/common-functions | 6 +++++-
 common/config           | 4 ++--
 common/func_compare.sh  | 1 -
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/common/common-functions b/common/common-functions
index 76b913d..33a72ec 100644
--- a/common/common-functions
+++ b/common/common-functions
@@ -203,12 +203,16 @@ wrt_target() {                     # Create target and initialize log file
 #----------------------------------#
   local i=$1
   local PREV=$2
+  case $i in
+    iteration* ) local LOGFILE=$this_script.log ;;
+             * ) local LOGFILE=$this_script ;;
+  esac
 (
 cat << EOF
 
 $i:  $PREV
 	@\$(call echo_message, Building)
-	@echo -e "\n\`date\`\n\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" >logs/$this_script
+	@echo -e "\n\`date\`\n\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" >logs/$LOGFILE
 EOF
 ) >> $MKFILE.tmp
 }
diff --git a/common/config b/common/config
index 593f300..8176606 100644
--- a/common/config
+++ b/common/config
@@ -25,8 +25,8 @@ GETPKG=0
 #    if the user has the right priviledges.
 SRC_ARCHIVE=$SRC_ARCHIVE
 
-# --- Server used as fallback if the file isn't found in
-# SRC_ARCHIVE and/or can't be dowloaded from upstream
+# --- Server used if the file isn't found in SRC_ARCHIVE.
+# As a last resort, the file will dowloaded from upstream, if possible.
 SERVER=ftp://ftp.lfs-matrix.net
 
 #=== Build options ===
diff --git a/common/func_compare.sh b/common/func_compare.sh
index 50197a0..e4ff4f7 100644
--- a/common/func_compare.sh
+++ b/common/func_compare.sh
@@ -108,7 +108,6 @@ wrt_logs() {             #
 (
     cat << EOF
 	@pushd logs 1> /dev/null && \\
-	rm $ITERATION && \\
 	mkdir $ITERATION && \\
 	mv ${LOGS} $ITERATION && \\
 	popd 1> /dev/null