Changeset 362 for branches

Timestamp:

06/29/2009 12:49:48 (3 years ago)

Author:

blee

Message:

Merge persistent working copy support for confexport from trunk.

Fixes #31

Location:

branches/confman-1.9

Files:

• . (modified) (1 prop)
• abspath.in (modified) (1 prop)
• confexport.8 (modified) (1 diff)
• conflock.in (modified) (1 prop)
• confman.conf.in (modified) (1 diff)
• confmanlib.sh.in (modified) (1 diff, 1 prop)

branches/confman-1.9/confexport.8

@@ -54 +54 @@
 will be written to the file specified in CONF_EXPORT_FILE (See
 .Xr confman.conf 5) .
+.Pp
+A persistent working copy can be specified with CONF_EXPORT_WORK_PATH in
+.Xr confman.conf 5 .
+This eliminates the performance overhead of repeatedly creating and
+destroying temporary working copies.
 .Sh SECURITY CONSIDERATIONS
 Because a tarball with all your configurations can potentially have sensitive

branches/confman-1.9/confman.conf.in

@@ -69 +69 @@
 CONF_EXPORT_USER="$(whoami)"
 CONF_EXPORT_GROUP="${CONF_GROUP}"
+CONF_EXPORT_WORK_PATH=""
 CONF_SSH_KEY="/root/.ssh/id_rsa"
 

branches/confman-1.9/confmanlib.sh.in

@@ -196 +196 @@
 function conf_export {
     local tarball="$1"
-    WORK_PATH=$(conf_tmp_dir)
+
+    if [ -z "${CONF_EXPORT_WORK_PATH}" ]; then
+        WORK_PATH=$(conf_tmp_dir)
+    else
+        WORK_PATH="${CONF_EXPORT_WORK_PATH}"
+    fi
+
     conf_checkout_tree
     tar -czf "$tarball" -C "${WORK_PATH}" .
-    rm -rf ${WORK_PATH}
+
+    if [ -z "${CONF_EXPORT_WORK_PATH}" ]; then
+        rm -rf ${WORK_PATH}
+    fi
 }