Changeset 414 for branches

Timestamp:

09/17/2009 22:42:59 (3 years ago)

Author:

ccowart

Message:

Merging REPO_URI changes from trunk into 1.9 branch.

Fixes #63

Location:

branches/confman-1.9

Files:

• . (modified) (1 prop)
• confexport.in (modified) (1 diff)
• confman.conf.5.in (modified) (1 diff)
• confman.conf.in (modified) (1 diff)
• confmancommon.sh.in (modified) (1 diff)
• confmanlib.sh.in (modified) (2 diffs)

branches/confman-1.9/confexport.in

@@ -39 +39 @@
     exit 1
 fi
+
+# This potentially changes the behavior for selecting the REPO_URI
+CONF_EXPORT="true"
 
 function print_help {

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

@@ -83 +83 @@
 .It CONF_EXPORT_MODE
 The permissions, in octal format, for the 
+.It EXPORT_REPO_PROTOCOL, EXPORT_REPO_HOSTNAME, EXPORT_REPO_PATH
+These options are analagous to their counterparts above (without the
+EXPORT prefixes). Use these to tell
+.Xr confexport 8 to look in an alternate location for the repository when
+automated access is provided by a separate mechanism from the interactive
+toolset. It can often be useful to have the repository accessible over
+"svn+ssh://" in interactive use (e.g., 
+.Xr confman 5 ), but to have local "file://" access for
+.Xr confexport 5 . These default to unset, in which case the repository
+will be found using the REPO_* configurations.
 .Xr confexport 8
 export. Defaults to 0640.

branches/confman-1.9/confman.conf.in

@@ -71 +71 @@
 CONF_EXPORT_WORK_PATH=""
 CONF_EXPORT_STYLE="repository"
+EXPORT_REPO_PROTOCOL=""
+EXPORT_REPO_HOSTNAME=""
+EXPORT_REPO_PATH=""
 CONF_SSH_KEY="/root/.ssh/id_rsa"
 

branches/confman-1.9/confmancommon.sh.in

@@ -122 +122 @@
 fi
 
-# Verify that required options have been set
-if [ "x${REPO_PROTOCOL}" = "xfile://" ] ; then
-    MUST_SET="REPO_PROTOCOL REPO_PATH"
-else
-    MUST_SET="REPO_PROTOCOL REPO_HOSTNAME REPO_PATH"
-fi
-
-for option in $MUST_SET ; do
-    conf_verify_option_set $option
-done
-
 # Test if the specified group exists before setting folder groups
 if ! [ -d "$REPO_DB" ] ; then

branches/confman-1.9/confmanlib.sh.in

@@ -31 +31 @@
 RECIPE_NAME="$(cat "$RECIPE_FILE" 2>/dev/null)"
 WCOPY_DIRTY="false"
+CONF_EXPORT="false"
 
 VERSION='@VERSION@'
@@ -39 +40 @@
         local proto="${REPO_PROTOCOL%:/*}"
         local uri
+
+    # When we're running in export mode and the user has configured
+    # a separate REPO location for it
+    if ${CONF_EXPORT} && [ -n "$EXPORT_REPO_PATH" ] ; then
+        # Determine which options must be set
+        if [ "x${EXPORT_REPO_PROTOCOL}" = "xfile://" ] ; then
+            MUST_SET="EXPORT_REPO_PROTOCOL EXPORT_REPO_PATH"
+        else
+            MUST_SET="EXPORT_REPO_PROTOCOL EXPORT_REPO_HOSTNAME 
+                EXPORT_REPO_PATH"
+        fi
+        REPO_PROTOCOL="$EXPORT_REPO_PROTOCOL"
+        REPO_HOSTNAME="$EXPORT_REPO_HOSTNAME"
+        REPO_PATH="$EXPORT_REPO_PATH"
+    else
+        # Determine which options must be set
+        if [ "x${REPO_PROTOCOL}" = "xfile://" ] ; then
+            MUST_SET="REPO_PROTOCOL REPO_PATH"
+        else
+            MUST_SET="REPO_PROTOCOL REPO_HOSTNAME REPO_PATH"
+        fi
+    fi
+    
+    # Verify that required options have been set
+    for option in $MUST_SET ; do
+        conf_verify_option_set $option
+    done
 
         case $proto in