Changeset 567 for branches

Timestamp:

12/16/2011 18:25:56 (5 months ago)

Author:

blee

Message:

Merge fix for #122 into confman-1.9.

Closes #122

Location:

branches/confman-1.9

Files:

• . (modified) (1 prop)
• confman.conf.5.in (modified) (1 diff)
• confman.conf.in (modified) (1 diff)
• confman.in (modified) (3 diffs)

branches/confman-1.9/confman.conf.5.in

@@ -213 +213 @@
 .Cm confman update
 will update only the recipe-relevant files when given no additional arguments.
+.It CONF_COMMIT_REPO_ONLY
+Defaults to "false".  Set it to "true" to change the behavior of
+.Xr confman 8
+"commit" to a repository-only operation, with no regard for the current
+machine's recipe or the subsequent rollout to the filesystem.  This is
+useful in centrally managed confexport/confsync environments.
 .El
 .Sh AUTHORS

branches/confman-1.9/confman.conf.in

@@ -110 +110 @@
 UPDATE_RELEVANT_ONLY="false"
 
+# In centrally managed confexport/confsync environments, the expected
+# behavior of a "confman commit" is a repository-only operation, with
+# with no regard for the current machine's recipe or the subsequent
+# rollout to the filesystem.
+CONF_COMMIT_REPO_ONLY="false"

branches/confman-1.9/confman.in

@@ -197 +197 @@
         cd "$WORK_PATH"
         until [ -z "$1" ] ; do
-            @SVN@ status "${1#${ABS_WORK}/}" >> "$status"
+            @SVN@ status "${1#${ABS_WORK}/}" | egrep -v "^\?" >> "$status"
             shift
         done
@@ -211 +211 @@
 }
 
-function commit {
+function commit_repo_only {
+    local msg status abswork
+    local opt OPTIND OPTARG
+    local wcopy_lock
+
+    wcopy_lock=$(conf_lock_wcopy)
+    abswork=$(conf_abswork)
+
+    while getopts ":m:F:" opt ; do
+        case $opt in
+            m)  LOG_MESSAGE="$OPTARG"; LOG_MESSAGE_SET="true" ;;
+            F)  LOG_FILE="$OPTARG" ;;
+            *)  echo "Invalid option '-${OPTARG}'." >&4
+                print_usage 1
+                ;;
+        esac
+    done
+    shift $(($OPTIND - 1))
+
+    [ -z "$1" ] || print_usage 1
+
+    if status=$(get_status "${abswork}"); then
+        nocommit=false
+        msg=$(get_log "$status") || conf_cleanExit
+        rm -f "$status"
+    fi
+
+    echo "Commit operation started" >&2
+
+    $nocommit || conf_commit_file $msg "${abswork}" || return $?
+
+    echo "Commit operation finished successfully" >&2
+
+    rm -f $msg
+    conf_unlock_wcopy $wcopy_lock
+}
+
+function commit_full {
     local msg status modules module symlink abswork files
     local nocommit=true
@@ -274 +311 @@
     conf_unlock_wcopy $wcopy_lock
     conf_unlock_system $system_lock
+}
+
+function commit {
+    if ${CONF_COMMIT_REPO_ONLY}; then
+        commit_repo_only "$@" || return $?
+    else
+        commit_full "$@" || return $?
+    fi
 }