Changeset 372 for branches

Timestamp:

07/01/2009 18:38:31 (3 years ago)

Author:

blee

Message:

Merging confsync fixes from trunk.

Location:

branches/confman-1.9

Files:

• . (modified) (1 prop)
• abspath.in (modified) (1 prop)
• conflock.in (modified) (1 prop)
• confmanlib.sh.in (modified) (1 prop)
• confsync.in (modified) (2 diffs)

branches/confman-1.9/confsync.in

@@ -107 +107 @@
 fi
 
-if [ -n "$sys_revision" ] && [ $tar_revision -lt $sys_revision ] ; then
+if [ -n "$sys_revision" ] && [ $tar_revision -le $sys_revision ] ; then
     echo "System is up to date." | conf_logger
+    conf_unlock_system
     rm -rf $tmpdir
+    trap EXIT
     exit 0
 fi
@@ -115 +117 @@
 echo "Sync operation started" | conf_logger
 for layer in $(conf_get_recipe) ; do
-        echo "Rolling on $layer..."
-        conf_rollout $layer || conf_cleanExit
+    echo "Rolling on $layer..."
+    conf_rollout $layer || conf_cleanExit
 done
 for file in $SINGULARITIES ; do
     echo "Assembing singularity $file..."
-        conf_assemble_sing $file || conf_cleanExit
+    conf_assemble_sing $file || conf_cleanExit
 done
 conf_markclean