summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2017-02-17 11:39:18 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-23 12:50:17 -0800
commit3c83b56309ab419f8cda72c0711479f60f61439a (patch)
tree90f1adc08c4dd3e56db42d20fd39ee1e499ed743
parentc3e6178acfb4a050852b6b52a97cdeda3f9ce666 (diff)
downloadpoky-3c83b56309ab419f8cda72c0711479f60f61439a.tar.gz
bitbake: 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. (Bitbake rev: 5b364b02270b0d7c2b7ca8d67fa2731bf93720ee) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/fetch2/svn.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/bitbake/lib/bb/fetch2/svn.py b/bitbake/lib/bb/fetch2/svn.py
index cabc290535..3271be326c 100644
--- a/bitbake/lib/bb/fetch2/svn.py
+++ b/bitbake/lib/bb/fetch2/svn.py
@@ -79,9 +79,9 @@ class Svn(FetchMethod):
79 79
80 proto = ud.parm.get('protocol', 'svn') 80 proto = ud.parm.get('protocol', 'svn')
81 81
82 svn_rsh = None 82 svn_ssh = None
83 if proto == "svn+ssh" and "rsh" in ud.parm: 83 if proto == "svn+ssh" and "ssh" in ud.parm:
84 svn_rsh = ud.parm["rsh"] 84 svn_ssh = ud.parm["ssh"]
85 85
86 svnroot = ud.host + ud.path 86 svnroot = ud.host + ud.path
87 87
@@ -113,8 +113,8 @@ class Svn(FetchMethod):
113 else: 113 else:
114 raise FetchError("Invalid svn command %s" % command, ud.url) 114 raise FetchError("Invalid svn command %s" % command, ud.url)
115 115
116 if svn_rsh: 116 if svn_ssh:
117 svncmd = "svn_RSH=\"%s\" %s" % (svn_rsh, svncmd) 117 svncmd = "SVN_SSH=\"%s\" %s" % (svn_ssh, svncmd)
118 118
119 return svncmd 119 return svncmd
120 120