Changeset 559 for branches

Timestamp:

12/16/2011 18:09:04 (5 months ago)

Author:

blee

Message:

Merge fix for #115 into confman-1.9.

Closes #115

Location:

branches/confman-1.9

Files:

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

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

@@ -131 +131 @@
 Defaults to "${HOME}/src/conf". Can be used to change the location of the
 working copy.
+.It REPO_REMOTE_USER
+Defaults to "", using the underlying 
+.Xr svn 1
+behavior. Use this to override the username for the repository host.
 .It SINGULARITIES
 Defaults to "". This is a white-space delimited list of all files that are to

branches/confman-1.9/confman.conf.in

@@ -33 +33 @@
 # The directory from the root of the repository to our checkpoints:
 REPO_CHECKPTS="checkpoints"
+
+# Our username on the repository host
+REPO_REMOTE_USER=""
 
 # Where to keep our "working copy" of the system:

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

@@ -7 +7 @@
 
 # The hostname providing our config repository:
-REPO_HOSTNAME="svn.timesinks.net"
+REPO_HOSTNAME="svn.example.com"
 
 # The path on the remote host to find the repository:

branches/confman-1.9/confmanlib.sh.in

@@ -40 +40 @@
 function conf_repo_uri {
         local proto="${REPO_PROTOCOL%:/*}"
-        local uri
+        local uri user
 
     # When we're running in export mode and the user has configured
@@ -69 +69 @@
     done
 
+    user=${REPO_REMOTE_USER:+${REPO_REMOTE_USER}@}
+
         case $proto in
                 file)
@@ -74 +76 @@
                         ;;
                 *)
-                        uri="${REPO_PROTOCOL}${REPO_HOSTNAME}${REPO_PATH}"
+                        uri="${REPO_PROTOCOL}${user}${REPO_HOSTNAME}${REPO_PATH}"
                         ;;
         esac