Changeset 526

Timestamp:

08/14/2011 17:41:50 (9 months ago)

Author:

blee

Message:

confexport now records the export style used in addition to the revision.

This catches export style changes, which need CONF_EXPORT_INCREMENTAL
disabled. This also means confexport runs when the administrator changes
the export style but the repository revision hasn't changed.

See #140

Location:

trunk

Files:

• confexport.in (modified) (2 diffs)
• confmanlib.sh.in (modified) (3 diffs)

trunk/confexport.in

@@ -101 +101 @@
 conf_checkout_tree
 
-export_revision=$(conf_revision)
-sys_revision=$(conf_export_sysrev)
+repo_export="${CONF_EXPORT_STYLE}:$(conf_revision)"
+sys_export="$(conf_export_sysrev)"
 
-conf_debug "export_revision is ${export_revision}"
-conf_debug "sys_revision is ${sys_revision}"
+conf_debug "repo_export: ${repo_export}"
+conf_debug "sys_export: ${sys_export}"
 
-if [ "${sys_revision}" -gt "${export_revision}" ]; then
-    echo "Error: The last export was newer than the current repository.  Exiting without making changes." >&2
-    conf_cleanExit 1
-elif [ "${sys_revision}" -eq "${export_revision}" ]; then
+if [ "${sys_export}" = "${repo_export}" ]; then
     if ! ${FORCE}; then
         echo "System is up to date." | conf_logger
@@ -117 +114 @@
 fi
 
-if ! conf_export "${temp_conf_export}" "${sys_revision}" "${export_revision}"; then
+repo_method=$(echo ${repo_export} | cut -d ':' -f 1)
+sys_method=$(echo ${sys_export} | cut -d ':' -f 1)
+repo_revision=$(echo ${repo_export} | cut -d ':' -f 2)
+sys_revision=$(echo ${sys_export} | cut -d ':' -f 2)
+
+if [ "${sys_method}" != "${repo_method}" ]; then
+    echo "Export style change detected: ${sys_method} -> ${repo_method}"
+    if ${CONF_EXPORT_INCREMENTAL}; then
+        echo "Ignoring CONF_EXPORT_INCREMENTAL during export style change"
+        CONF_EXPORT_INCREMENTAL="false"
+    fi
+fi
+
+if [ "${sys_revision}" -gt "${repo_revision}" ]; then
+    echo "Error: The last export was newer than the current repository.  Exiting without making changes." >&2
+    conf_cleanExit 1
+fi
+
+if ! conf_export "${temp_conf_export}" "${sys_revision}" "${repo_revision}"; then
     echo "Error: The export failed. Exiting." >&2
     rm -rf "${temp_conf_export}"

trunk/confmanlib.sh.in

@@ -1100 +1100 @@
     local rv
 
-    export_sysrev=0
+    export_sysrev="none:0"
     rv=0
 
@@ -1106 +1106 @@
         if ! export_sysrev=$(cat "${EXPORT_REV_FILE}"); then
             echo "Could not read file: ${EXPORT_REV_FILE}" >&2
-            export_sysrev=0
+            export_sysrev="none:0"
             rv=1
         fi
     fi
 
-    echo ${export_sysrev}
+    echo "${export_sysrev}"
     return ${rv}
 }
@@ -1135 +1135 @@
     local revision=$(conf_revision)
 
-    if ! echo "${revision}" > "${EXPORT_REV_FILE}"; then
+    if ! echo "${CONF_EXPORT_STYLE}:${revision}" > "${EXPORT_REV_FILE}"; then
             echo "Could not record export to file: ${EXPORT_REV_FILE}" >&2
             return 1