[Fai-commit] r4280 - in people/h01ger/softupdate-git-rpm: debian lib

[Holger Levsen]

Author: h01ger-guest
Date: 2007-05-03 17:26:32 +0000 (Thu, 03 May 2007)
New Revision: 4280

Modified:
   people/h01ger/softupdate-git-rpm/debian/changelog
   people/h01ger/softupdate-git-rpm/lib/get-config-dir-svn
Log:
bugfix

Modified: people/h01ger/softupdate-git-rpm/debian/changelog
===================================================================
--- people/h01ger/softupdate-git-rpm/debian/changelog	2007-05-03 09:59:13 UTC (rev 4279)
+++ people/h01ger/softupdate-git-rpm/debian/changelog	2007-05-03 17:26:32 UTC (rev 4280)
@@ -1,3 +1,9 @@
+fai (3.1.8-0.holger.2) unstable; urgency=low
+
+  * make svn+ssh work with a username again
+
+ -- Holger Levsen <debian at layer-acht.org>  Tue, 24 Apr 2007 20:39:32 +0200
+
 fai (3.1.8-0.holger.1) unstable; urgency=low
 
   * added get-config-dir-git
@@ -5,8 +11,9 @@
   * fixed subroutines to not give an error if not installed with fai
     (Closes: #415880)
   * add support for svn+ssh for get-config-svn
+  * fix get-config-svn so it works without a user@ in $URL
 
- -- Holger Levsen <debian at layer-acht.org>  Wed, 11 Apr 2007 16:44:33 +0200
+ -- Holger Levsen <debian at layer-acht.org>  Sat, 14 Apr 2007 13:51:45 +0200
 
 fai (3.1.8) unstable; urgency=medium
 

Modified: people/h01ger/softupdate-git-rpm/lib/get-config-dir-svn
===================================================================
--- people/h01ger/softupdate-git-rpm/lib/get-config-dir-svn	2007-05-03 09:59:13 UTC (rev 4279)
+++ people/h01ger/softupdate-git-rpm/lib/get-config-dir-svn	2007-05-03 17:26:32 UTC (rev 4280)
@@ -28,7 +28,9 @@
 		svnurl="https://$svnpath"
 		;;
 	svn+ssh)
-		svnurl="svn+ssh://$svnpath"
+		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"
@@ -37,6 +39,7 @@
 esac
 		
 [ -n "$username" ] && user="--username $username"
+[ -z "$username" ] && svnurl=$FAI_CONFIG_SRC
 
 if [ -d "$FAI/.svn" ] ; then
    echo "Updating SVN in $FAI"