diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-19 14:32:08 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-22 12:03:02 +0000 |
commit | 9d7f8e2a206f8266fd0766b6161dbd1bf6b787a7 (patch) | |
tree | 2002648fd17558c7d895d672aa65fa46f4b82250 /bitbake/lib/bb/fetch2/ssh.py | |
parent | 4acc7322a2ada941b803e1aee23d84351888eef0 (diff) | |
download | poky-9d7f8e2a206f8266fd0766b6161dbd1bf6b787a7.tar.gz |
bitbake: fetch2: Stop passing around the pointless url parameter
There is no good reason to keep passing around the url parameter when
its contained within urldata (ud). This is left around due to
legacy reasons, some functions take it, some don't and its time
to cleanup.
This is fetcher internal API, there are a tiny number of external users
of the internal API (buildhistory and distrodata) which can be fixed up
after this change.
(Bitbake rev: 6a48474de9505a3700863f31839a7c53c5e18a8d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/fetch2/ssh.py')
-rw-r--r-- | bitbake/lib/bb/fetch2/ssh.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/bb/fetch2/ssh.py b/bitbake/lib/bb/fetch2/ssh.py index 8b5acbf6db..4ae979472c 100644 --- a/bitbake/lib/bb/fetch2/ssh.py +++ b/bitbake/lib/bb/fetch2/ssh.py | |||
@@ -72,8 +72,8 @@ __pattern__ = re.compile(r''' | |||
72 | class SSH(FetchMethod): | 72 | class SSH(FetchMethod): |
73 | '''Class to fetch a module or modules via Secure Shell''' | 73 | '''Class to fetch a module or modules via Secure Shell''' |
74 | 74 | ||
75 | def supports(self, url, urldata, d): | 75 | def supports(self, urldata, d): |
76 | return __pattern__.match(url) != None | 76 | return __pattern__.match(urldata.url) != None |
77 | 77 | ||
78 | def supports_checksum(self, urldata): | 78 | def supports_checksum(self, urldata): |
79 | return False | 79 | return False |
@@ -89,10 +89,10 @@ class SSH(FetchMethod): | |||
89 | host = m.group('host') | 89 | host = m.group('host') |
90 | urldata.localpath = os.path.join(d.getVar('DL_DIR', True), os.path.basename(path)) | 90 | urldata.localpath = os.path.join(d.getVar('DL_DIR', True), os.path.basename(path)) |
91 | 91 | ||
92 | def download(self, url, urldata, d): | 92 | def download(self, urldata, d): |
93 | dldir = d.getVar('DL_DIR', True) | 93 | dldir = d.getVar('DL_DIR', True) |
94 | 94 | ||
95 | m = __pattern__.match(url) | 95 | m = __pattern__.match(urldata.url) |
96 | path = m.group('path') | 96 | path = m.group('path') |
97 | host = m.group('host') | 97 | host = m.group('host') |
98 | port = m.group('port') | 98 | port = m.group('port') |