summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2013-01-31 18:12:09 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-03 17:02:22 (GMT)
commit6e9776042b7ae58b1b38924933dbd5d0e7426029 (patch)
treeb9c333426777c05fdd49af5514721137f52475e3
parent2b300848744ba879938612850f313e3256360dc6 (diff)
downloadpoky-6e9776042b7ae58b1b38924933dbd5d0e7426029.tar.gz
bitbake: ssh.py: throw ParameterError when someone tries ssh://foo; protocol=git
* taken from SFTP fetcher: http://patchwork.openembedded.org/patch/43027/ (Bitbake rev: 6437b324a15e2730a12968beb58c2087aa712f46) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/fetch2/ssh.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/bitbake/lib/bb/fetch2/ssh.py b/bitbake/lib/bb/fetch2/ssh.py
index 61db435..721fb35 100644
--- a/bitbake/lib/bb/fetch2/ssh.py
+++ b/bitbake/lib/bb/fetch2/ssh.py
@@ -73,6 +73,11 @@ class SSH(FetchMethod):
73 return False 73 return False
74 74
75 def urldata_init(self, urldata, d): 75 def urldata_init(self, urldata, d):
76 if 'protocol' in urldata.parm and urldata.parm['protocol'] == 'git':
77 raise bb.fetch2.ParameterError(
78 "Invalid protocol - if you wish to fetch from a git " +
79 "repository using ssh, you need to use " +
80 "git:// prefix with protocol=ssh", urldata.url)
76 m = __pattern__.match(urldata.url) 81 m = __pattern__.match(urldata.url)
77 path = m.group('path') 82 path = m.group('path')
78 host = m.group('host') 83 host = m.group('host')