Skip to contentSkip to conversation

Fix to svn fetcher

PATCH New Markus Lehtonen 1 participant 2 messages Feb 17, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix to svn fetcher

I came up with this patch when working on Yocto bug #10405 and going through all the svn fetcher parameters. I'm not an SVN expert but the code looked broken and the documentation is incorrect, too, e.g. in that svn does not support rsh:// protocol.

Markus Lehtonen (1):
fetch2/svn: change 'rsh' parameter to 'ssh'

 lib/bb/fetch2/svn.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
Signature · 1 line
2.6.6
#1 lore raw

PATCH 1/1 fetch2/svn: change 'rsh' parameter to 'ssh'

The functionality around the 'rsh' parameter seemed to be broken. The 'rsh' parameter was only used when 'protocol' was set to 'svn+ssh' which is confusing. The 'rsh' parameter was used for setting the value of 'svn_RSH' environment variable, which however, is not supported by svn (not at least according to SVN documentation).

This patch removes the 'rsh' parameter and replaces it with 'ssh'. This new (optional) parameter is used when svn+ssh protocol is used and it can be used to specify the ssh program used by svn. This is achieved by setting the SVN_SSH environment variable which is mentioned in SVN documentation.

---
 lib/bb/fetch2/svn.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
lib/bb/fetch2/svn.py +5 -5
index d6feeb2..7111895 100644
@@ -79,9 +79,9 @@ class Svn(FetchMethod):
 
         proto = ud.parm.get('protocol', 'svn')
 
-        svn_rsh = None
-        if proto == "svn+ssh" and "rsh" in ud.parm:
-            svn_rsh = ud.parm["rsh"]
+        svn_ssh = None
+        if proto == "svn+ssh" and "ssh" in ud.parm:
+            svn_ssh = ud.parm["ssh"]
 
         svnroot = ud.host + ud.path
 
@@ -113,8 +113,8 @@ class Svn(FetchMethod):
             else:
                 raise FetchError("Invalid svn command %s" % command, ud.url)
 
-        if svn_rsh:
-            svncmd = "svn_RSH=\"%s\" %s" % (svn_rsh, svncmd)
+        if svn_ssh:
+            svncmd = "SVN_SSH=\"%s\" %s" % (svn_ssh, svncmd)
 
         return svncmd
 
Signature · 1 line
2.6.6