diff options
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2017-02-17 11:21:50 +0200
committerMarkus Lehtonen <markus.lehtonen@linux.intel.com>2017-02-17 11:30:24 +0200
commit95a6459660fe58da9ae4385112a3730e6b3d2b95 (patch)
parentb9777374cbe63cdcf80767033f628c26d23e90f9 (diff)
fetch2/svn: change 'rsh' parameter to 'ssh'marquiz/bitbake/fixes
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. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/bb/fetch2/svn.py b/lib/bb/fetch2/svn.py
index d6feeb22a4..7111895c28 100644
--- a/lib/bb/fetch2/svn.py
+++ b/lib/bb/fetch2/svn.py
@@ -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):
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