Changeset b414549 for common

Timestamp:

05/04/2006 06:30:06 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

d20c553

Parents:

17c7894

Message:

Merged r2630 and r2631 from trunk.

Location:

common

Files:

• common-functions (modified) (2 diffs)
• config (modified) (1 diff)
• func_compare.sh (modified) (1 diff)

common/common-functions

@@ -204 +204 @@
   local i=$1
   local PREV=$2
+  case $i in
+    iteration* ) local LOGFILE=$this_script.log ;;
+             * ) local LOGFILE=$this_script ;;
+  esac
 (
 cat << EOF
@@ -209 +213 @@
 $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

common/config

@@ -26 +26 @@
 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
 

common/func_compare.sh

@@ -109 +109 @@
     cat << EOF
         @pushd logs 1> /dev/null && \\
-        rm $ITERATION && \\
         mkdir $ITERATION && \\
         mv ${LOGS} $ITERATION && \\