Changeset 566 for branches

Timestamp:

12/16/2011 18:24:58 (5 months ago)

Author:

blee

Message:

Merge fix for #146 into confman-1.9.

Closes #146

Location:

branches/confman-1.9

Files:

• . (modified) (1 prop)
• confman.in (modified) (4 diffs)

branches/confman-1.9/confman.in

@@ -248 +248 @@
     $SUDO ${SUDO:+-v}
 
-    update
-    
     if status=$(get_status $modules $symlinks); then
         nocommit=false
@@ -260 +258 @@
     echo "Commit operation started" >&2
     $nocommit || conf_commit_file $msg $files || return $?
+
+    update
+
     for layer in $(conf_get_recipe) ; do
         echo "Rolling on $layer..."
@@ -307 +308 @@
     $SUDO ${SUDO:+-v}
 
-    update
     if status=$(get_status $files) ; then
         nocommit=false
@@ -315 +315 @@
     echo "Installation operation started." >&2
     $nocommit || conf_commit_file "$msg" "$files" || return $?
+
+    update
     
     for layer in $(conf_get_recipe) ; do