Changeset 536 for trunk

Timestamp:

08/21/2011 17:48:31 (9 months ago)

Author:

blee

Message:

Commit changes to the repository before updating the working copy.

This ensures that the working copy is in a consistent state before
rolling out changes onto the filesystem.

Fixes #146

File:

• trunk/confman.in (modified) (4 diffs)

trunk/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