[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4764/8267] bitbake: fetch2/svn: change 'rsh' parameter to 'ssh'

[Emmanuele Bassi <ebassi src gnome org>]

commit 3c83b56309ab419f8cda72c0711479f60f61439a
Author: Markus Lehtonen <markus lehtonen linux intel com>
Date:   Fri Feb 17 11:39:18 2017 +0200

    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>

 bitbake/lib/bb/fetch2/svn.py |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/bitbake/lib/bb/fetch2/svn.py b/bitbake/lib/bb/fetch2/svn.py
index cabc290..3271be3 100644
--- a/bitbake/lib/bb/fetch2/svn.py
+++ b/bitbake/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):
             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