package: fai-client
version: 3.2
severity: normal
tags: patch

Hi,

during the fai tutorial we tried to use svn+ssh to access the fai-configspace 
which failed with "method not implemented" error.

Using my get-fai-configdir-svn it worked well, attached is the diff of that 
version against trunk.


regards,
        Holger
--- ../../trunk/lib/get-config-dir-svn	2007-09-11 21:06:17.000000000 +0200
+++ softupdate-git/lib/get-config-dir-svn	2007-05-07 20:05:40.000000000 +0200
@@ -10,22 +10,14 @@
 ### END SUBROUTINE INFO
 
 # matched string: "svn://[EMAIL PROTECTED]/svnpath"
-# strings without user@ are processed below
 protocol=$(expr match "$FAI_CONFIG_SRC" '\([^:]*\)://')
 username=$(expr match "$FAI_CONFIG_SRC" '[^:]*://\([EMAIL PROTECTED])@')
 svnpath=$(expr match "$FAI_CONFIG_SRC" '[^:]*://[EMAIL PROTECTED]@\([^[: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://[EMAIL PROTECTED]"
+		# 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://[EMAIL PROTECTED]
+		;;
 	*)
 		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"

Attachment: pgpLubZKCY9lv.pgp
Description: PGP signature

Reply via email to