Changeset 484 for branches

Timestamp:

11/11/2009 14:21:33 (3 years ago)

Author:

ccowart

Message:

Merging fix for regression on installing directories from trunk.

Resolves #86

Location:

branches/confman-1.9

Files:

• . (modified) (1 prop)
• confman.in (modified) (8 diffs)
• confmanlib.sh.in (modified) (4 diffs)

branches/confman-1.9/confman.in

@@ -189 +189 @@
 
 function commit {
-    local msg status modules module modpath
+    local msg status modules module symlink symlinks
     local nocommit=true
     local opt OPTIND OPTARG
@@ -211 +211 @@
     wcopy_lock=$(conf_lock_wcopy)
     
-    for module in $(conf_get_recipe) ; do
-        modpath=$(${readlink_cmd} -m ${WORK_PATH}/${module})
-        modules=${modules:+${modules} }${modpath}
+    for module in $(conf_get_recipe); do
+        modules=${modules:+${modules} }${module}
+        for symlink in $(find ${WORK_PATH}/${module} \
+            -type l -exec ${readlink_cmd} -m {} \; -print)
+        do
+            symlink=$(conf_rel_path "${symlink}")
+            symlinks="${symlinks:+${symlinks} }${symlink}"
+        done
     done
     
@@ -219 +224 @@
     conf_update_tree || conf_cleanExit
     
-    if status=$(get_status $modules) ; then
+    if status=$(get_status $modules $symlinks); then
         nocommit=false
         msg=$(get_log "$status") || conf_cleanExit
@@ -228 +233 @@
     
     echo "Commit operation started" >&2
-    $nocommit || conf_commit "$(conf_get_recipe)" $msg || return $?
+    $nocommit || conf_commit_file $msg $modules $symlinks || return $?
     for layer in $(conf_get_recipe) ; do
         echo "Rolling on $layer..."
@@ -256 +261 @@
             m)  LOG_MESSAGE="$OPTARG"; LOG_MESSAGE_SET="true" ;;
             F)  LOG_FILE="$OPTARG" ;;
-            N)  innercall=true ;;
             *)  echo "Invalid option '-${OPTARG}'." >&4
                 print_usage 1
@@ -274 +278 @@
     $SUDO ${SUDO:+-v}
 
-    # This stuff we only do in the top-level call, not on recursive calls...
-    if ! conf_lock_is_recursive $wcopy_lock ; then
-        conf_update_tree || conf_cleanExit
-        if status=$(get_status $files) ; then
-            nocommit=false
-            msg=$(get_log "$status") || conf_cleanExit
-            rm -f "$status"
-        fi
-        echo "Installation operation started." >&2
-        $nocommit || conf_commit_file "$msg" "$files" || return $?
-    fi
-    
-    for file in "$@" ; do
-        for layer in $(conf_get_recipe) ; do
-            conf_install $layer "$@"
-        done
-        for sing in $SINGULARITIES ; do
-            if [ "$sing" = "$file" ] ; then
-                conf_assemble_sing $file || conf_cleanExit
-            fi
-        done
+    conf_update_tree || conf_cleanExit
+    if status=$(get_status $files) ; then
+        nocommit=false
+        msg=$(get_log "$status") || conf_cleanExit
+        rm -f "$status"
+    fi
+    echo "Installation operation started." >&2
+    $nocommit || conf_commit_file "$msg" "$files" || return $?
+    
+    for layer in $(conf_get_recipe) ; do
+        conf_install $layer "$@"
+    done
+    for file in $SINGULARITIES ; do
+        conf_assemble_sing $file || conf_cleanExit
     done
     conf_recordAction install
@@ -859 +856 @@
     wcopy_lock=$(conf_lock_wcopy)
     conf_ln $target $link $forced
-    conf_unlock_wcopy $(wcopy_lock)
+    conf_unlock_wcopy $wcopy_lock
 }
 
@@ -880 +877 @@
     wcopy_lock=$(conf_lock_wcopy)
     conf_chattr "$attr" "$value" "$@"
-    conf_unlock_wcopy $(wcopy_lock)
+    conf_unlock_wcopy $wcopy_lock
 }
 

branches/confman-1.9/confmanlib.sh.in

@@ -263 +263 @@
 
     return 0
-}
-
-# Commits module $1 with message $2
-function conf_commit {
-        local modules=$(echo $1 | tr ' ' ',')
-        local msg="$2"
-    local symlinks
-
-    # $modules is in the form foo,bar,baz. This eval trick forces
-    # curly brace expansion.
-    if echo "$modules" | grep ',' > /dev/null ; then
-        for module in $(eval echo ${WORK_PATH}/{$modules}); do
-            symlinks="$symlinks `find ${module} -type l \
-                -exec ${readlink_cmd} -m {} \;`"
-        done
-            @SVN@ commit -F "$msg" $(eval echo ${WORK_PATH}/{$modules}) \
-            $symlinks
-    else
-        symlinks="$symlinks `find ${modules} -type l \
-            -exec ${readlink_cmd} -m {} \;`"
-        @SVN@ commit -F "$msg" ${WORK_PATH}/$modules \
-            $symlinks
-    fi
 }
 
@@ -474 +451 @@
 }
 
+function conf_livefile {
+    local file="$1"
+    local path=$(conf_rel_path "$file") || return
+    echo ${path#*/}/
+}
+
+function conf_wfile_is_singularity {
+    local file=$(${readlink_cmd} -m "$1")
+    ABS_WORK=$(${readlink_cmd} -m "$WORK_PATH")
+    local module=${file#${ABS_WORK}/}
+    module=${module%%/*}
+    local livefile=$(conf_livefile $file)
+    local sing
+    for sing in $SINGULARITIES ; do
+        if [ "$sing" = "${livefile%-$module}" ] ; then
+            return 0
+        fi
+    done
+    return 1
+}
+
+# Takes a file as an argument and returns the path of the file relative
+# to WORK_PATH/ABS_WORK
+function conf_rel_path {
+    local file="$1"
+    local result
+
+    if ! result=$(conf_rel_path_helper "$file") ; then
+        echo "$file" does not appear to be located within $WORK_PATH >&2
+        return 1
+    fi
+
+    echo ${result#/}
+    return 0
+}
+
+# Recursive helper for determining conf_rel_path
+function conf_rel_path_helper {
+    local file="$1"
+    local target=$(${readlink_cmd} -m "$file")
+    local ABS_WORK=$(${readlink_cmd} -m "$WORK_PATH")
+    local dir rc sofar
+
+    if [ "$target" = "$ABS_WORK" ] ; then
+        return 0
+    elif [ "$file" = "/" ] ; then
+        return 1
+    else
+        dir=$(dirname "$file")
+        case "$dir" in
+            ".")    dir=$(pwd);;
+            "..")   dir=$(cd ..; pwd);;
+        esac
+        sofar=$(conf_rel_path "$dir") || return $?
+        printf "%s/%s" "$sofar" $(basename "$file")
+        return 0
+    fi
+}
+
 function conf_install {
+    conf_debug conf_install called with args "$@"
+    ABS_WORK=$(${readlink_cmd} -m "$WORK_PATH")
         local module="$1"
-        shift
-        local file=`$ABSPATH $1`
-        shift
-        local moduledir="${WORK_PATH}/$module"
-        local livefile=`echo "$file" | ${sed_cmd} -e "s:${WORK_PATH}/[^/]+::"`
-        local pathmodule=`echo "$file" | ${sed_cmd} -e "s:${WORK_PATH}/([^/]+).*:\1:"`
-        local suffix
-    local targetfile=`${readlink_cmd} -m $file`
-        livefile=`echo "$livefile" | ${sed_cmd} -e "s:-${pathmodule}$::"`
-        if [[ $SINGULARITIES =~ $livefile ]] && [ ! -d "$targetfile" ] ; then
-                suffix="-${module}"
-        fi
-        livefile="${livefile}${suffix}"
-
+    local file="$2"
+    shift 2
+    local livefile
+    local failures=false
+
+    # Recursive base case
+    if [ -z "$file" ] ; then
+        conf_debug "conf_install base case reached"
+        return 0
+    fi
+
+    file=$(conf_rel_path "$file") || return 1
+    livefile="/${file#*/}"
+    file="${ABS_WORK}/${file}"
 
         # See if it even exists
-        file="${moduledir}${livefile}"
-    targetfile=`${readlink_cmd} -m $file`
-        if [ ! -e "$targetfile" ] && [ -z "$1" ] ; then
-                return 0
-        elif [ ! -f "$targetfile" ] && [ ! -d "$targetfile" ] ; then
-                conf_install $module "$@"
-                return
-        fi
+    if [ ! -e "$file" ] ; then
+        conf_debug "$file" does not appear to exist
+        conf_install $module "$@"
+        return 1
+    fi
 
         # If we got here, figure it out
@@ -507 +542 @@
     local symlink="`conf_get_prop ${file} symlink`"
 
-    file="$targetfile"
         if [ -f "$file" ] ; then
                 local opts="-o $owner -g $group -m $mode"
@@ -520 +554 @@
     fi
 
-        ${NFS_HACK:-false} && chmod o+rx ${WORK_PATH}
+        ${NFS_HACK:-false} && chmod o+rx ${ABS_WORK}
         echo $cmd
-        $cmd
-        ${NFS_HACK:-false} && chmod o-rx ${WORK_PATH}
+        $cmd || failures=true
+        ${NFS_HACK:-false} && chmod o-rx ${ABS_WORK}
 
     if [ -d "$file" ] ; then
-        conf_install $module "$file"/*
-    fi
-        if [ ! -z $1 ] ; then
-                conf_install $module "$@"
-        fi
-}
-
+        conf_debug "conf_install encountered a directory. Recursing."
+        conf_install $module $(find "$file" \
+            -mindepth 1 -maxdepth 1 -not -name '.svn') || failures=true
+    fi
+    conf_debug "conf_install recursing"
+        conf_install $module "$@" || failures=true
+    conf_debug "conf_install returning"
+    if $failures ; then 
+        return 1
+    else
+        return 0
+    fi
+}
 
 function conf_list {