Changeset 488

Timestamp:

11/11/2009 14:29:08 (2 years ago)

Author:

ccowart

Message:

Merging commit working directory bug fix from trunk.

Resolves #91

Location:

branches/confman-1.9

Files:

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

branches/confman-1.9/confman.in

@@ -189 +189 @@
 
 function commit {
-    local msg status modules module symlink symlinks
+    local msg status modules module symlink abswork files
     local nocommit=true
     local opt OPTIND OPTARG
@@ -210 +210 @@
     system_lock=$(conf_lock_system)
     wcopy_lock=$(conf_lock_wcopy)
+    abswork=$(conf_abswork)
     
     for module in $(conf_get_recipe); do
@@ -217 +218 @@
         do
             symlink=$(conf_rel_path "${symlink}")
-            symlinks="${symlinks:+${symlinks} }${symlink}"
+            files="${files:+${files} }${abswork}/${symlink}"
         done
+        files="${files:+${files} }${abswork}/${module}"
     done
     
@@ -233 +235 @@
     
     echo "Commit operation started" >&2
-    $nocommit || conf_commit_file $msg $modules $symlinks || return $?
+    $nocommit || conf_commit_file $msg $files || return $?
     for layer in $(conf_get_recipe) ; do
         echo "Rolling on $layer..."

branches/confman-1.9/confmanlib.sh.in

@@ -91 +91 @@
 function conf_recipe_path {
     echo "$(conf_recipe_dir)/${RECIPE_NAME}"
+}
+
+function conf_abswork {
+    ${readlink_cmd} -m "$WORK_PATH"
 }