r2632 - jhalfs/branches/experimental/common

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Thu May 4 11:30:09 PDT 2006


Author: manuel
Date: 2006-05-04 12:30:06 -0600 (Thu, 04 May 2006)
New Revision: 2632

Modified:
   jhalfs/branches/experimental/common/common-functions
   jhalfs/branches/experimental/common/config
   jhalfs/branches/experimental/common/func_compare.sh
Log:
Merged r2630 and r2631 from trunk.

Modified: jhalfs/branches/experimental/common/common-functions
===================================================================
--- jhalfs/branches/experimental/common/common-functions	2006-05-04 18:26:42 UTC (rev 2631)
+++ jhalfs/branches/experimental/common/common-functions	2006-05-04 18:30:06 UTC (rev 2632)
@@ -203,12 +203,16 @@
 #----------------------------------#
   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
 }

Modified: jhalfs/branches/experimental/common/config
===================================================================
--- jhalfs/branches/experimental/common/config	2006-05-04 18:26:42 UTC (rev 2631)
+++ jhalfs/branches/experimental/common/config	2006-05-04 18:30:06 UTC (rev 2632)
@@ -25,8 +25,8 @@
 #    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 ===

Modified: jhalfs/branches/experimental/common/func_compare.sh
===================================================================
--- jhalfs/branches/experimental/common/func_compare.sh	2006-05-04 18:26:42 UTC (rev 2631)
+++ jhalfs/branches/experimental/common/func_compare.sh	2006-05-04 18:30:06 UTC (rev 2632)
@@ -108,7 +108,6 @@
 (
     cat << EOF
 	@pushd logs 1> /dev/null && \\
-	rm $ITERATION && \\
 	mkdir $ITERATION && \\
 	mv ${LOGS} $ITERATION && \\
 	popd 1> /dev/null




More information about the alfs-log mailing list