Changeset 564 for branches

Timestamp:

12/16/2011 18:19:05 (5 months ago)

Author:

blee

Message:

Merge fix for #147 into confman-1.9.

Closes #147

Location:

branches/confman-1.9

Files:

• . (modified) (1 prop)
• confsync.in (modified) (1 diff)

branches/confman-1.9/confsync.in

@@ -117 +117 @@
 last_action=$(conf_lastact)
 
-if [ "x$last_action" = "xinstall" ] && [ $tar_revision -lt $sys_revision ]
-then
-    echo "Error: File system may be dirty." \
-        "A commit operation is recommended." >&2
-    echo "Error: $tarpath is out of date. Exiting without making changes." >&2
-    conf_markdirty
-    conf_cleanExit 1
-fi
-
-if [ -n "$sys_revision" ] ; then
-    if $FORCE && [ $tar_revision -lt $sys_revision ] ; then
-        echo "Error: $tarpath is out of date. Exiting without making changes." >&2
+if [ -n "${sys_revision}" ] ; then
+    if [ "${tar_revision}" -lt "${sys_revision}" ]; then
+        echo "Error: ${tarpath} is out of date. Exiting without making changes." >&2
+        conf_markdirty
         conf_cleanExit 1
-    elif ! $FORCE && [ $tar_revision -le $sys_revision ] ; then
-        $QUIET || echo "System is up to date." | conf_logger
-        conf_cleanExit 0
+    elif ! ${FORCE} && [ "${tar_revision}" -eq "${sys_revision}" ]; then
+        if [ "${last_action}" = "commit" -o "${last_action}" = "sync" ]; then
+            ${QUIET} || echo "System is up to date." | conf_logger
+            conf_cleanExit 0
+        fi
     fi
 fi