Changeset 484 for branches/confman-1.9/confman.in

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)

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
 }