[Fai-commit] r4591 - in trunk: debian lib

[h01ger-guest at alioth.debian.org]

Author: h01ger-guest
Date: 2007-09-17 10:12:20 +0000 (Mon, 17 Sep 2007)
New Revision: 4591

Modified:
   trunk/debian/changelog
   trunk/lib/get-config-dir-svn
Log:
- make get-config-dir-svn work for svn+ssh with username (Closes: #442021)


[12:08] <Mrfai> h01ger: yep please commit get-config-dir-svn to trunk


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-09-16 19:51:32 UTC (rev 4590)
+++ trunk/debian/changelog	2007-09-17 10:12:20 UTC (rev 4591)
@@ -1,5 +1,6 @@
 fai (3.2.1~beta1) unstable; urgency=low
 
+  [ Thomas Lange ]
   * mount swap partitions with identical priorities
   * fai-mirror: also match lowercase class names (for hostsnames),
     use $cfdir instead of fixed path /etc/fai
@@ -35,9 +36,12 @@
   * examples/etc/dhcpd.conf: fix path
   * faimond-gui: new tool that produces graphical output of faimond
   * faimond-gui.8: new man page
-  
- -- Thomas Lange <lange at debian.org>  Sun, 16 Sep 2007 21:50:33 +0200
 
+  [ Holger Levsen ]
+  * make get-config-dir-svn work for svn+ssh with username (Closes: #442021)
+
+ -- Holger Levsen <holger at debian.org>  Mon, 17 Sep 2007 11:44:42 +0200
+
 fai (3.2) unstable; urgency=low
 
   * subroutines-linux: fix extra slash in path (closes: #428860),

Modified: trunk/lib/get-config-dir-svn
===================================================================
--- trunk/lib/get-config-dir-svn	2007-09-16 19:51:32 UTC (rev 4590)
+++ trunk/lib/get-config-dir-svn	2007-09-17 10:12:20 UTC (rev 4591)
@@ -10,22 +10,14 @@
 ### END SUBROUTINE INFO
 
 # matched string: "svn://user@host/svnpath"
-# strings without user@ are processed below
 protocol=$(expr match "$FAI_CONFIG_SRC" '\([^:]*\)://')
 username=$(expr match "$FAI_CONFIG_SRC" '[^:]*://\([^@]*\)@')
 svnpath=$(expr match "$FAI_CONFIG_SRC" '[^:]*://[^@]\+@\([^[:space:]]\+\)')
-[ -n "$username" ] && user="--username $username"
-[ -z "$username" ] && svnurl=$FAI_CONFIG_SRC # if no user is specified
 
 case $protocol in
 	svn)
 		svnurl="svn://$svnpath"
 		;;
-        svn+ssh)
-	        svnurl="svn+ssh://$svnpath"
-		user=""
-		export SVN_SSH="ssh -l $username"
-		;;
 	svn+file)
 		svnurl="file://$svnpath"
 		;;
@@ -35,12 +27,19 @@
 	svn+https)
 		svnurl="https://$svnpath"
 		;;
+	svn+ssh)
+		svnurl="svn+ssh://$username@$svnpath"
+		# this is a bit hackish: if $username is empty, the path gets corrected below... 
+		# explaination: svn co -username foo svn+ssh://bar doesnt work as svn co svn+ssh://foo@bar
+		;;
 	*)
 		echo "get-config-dir-svn: protocol $protocol not implemented"
 		exit 1
 		;;
 esac
 		
+[ -n "$username" ] && user="--username $username"
+[ -z "$username" ] && svnurl=$FAI_CONFIG_SRC
 
 if [ -d "$FAI/.svn" ] ; then
    echo "Updating SVN in $FAI"