summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/fetch2
diff options
context:
space:
mode:
authorFrazer Clews <frazerleslieclews@gmail.com>2020-08-24 15:51:37 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-25 18:14:53 +0100
commitabc6f864b9c6fa9a47a218a8250e79dcfa367d4d (patch)
treee4dfa762398e1b2a8ae019e0039417be3e85d99c /bitbake/lib/bb/fetch2
parentac3593f6ed8f2ffb0bb62df47220b598cc1781f6 (diff)
downloadpoky-abc6f864b9c6fa9a47a218a8250e79dcfa367d4d.tar.gz
bitbake: lib: fix most undefined code picked up by pylint
Correctly import, and inherit functions, and variables. Also fix some typos and remove some Python 2 code that isn't recognised. (Bitbake rev: b0c807be5c2170c9481c1a04d4c11972135d7dc5) Signed-off-by: Frazer Clews <frazerleslieclews@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/fetch2')
-rw-r--r--bitbake/lib/bb/fetch2/osc.py3
-rw-r--r--bitbake/lib/bb/fetch2/ssh.py7
2 files changed, 6 insertions, 4 deletions
diff --git a/bitbake/lib/bb/fetch2/osc.py b/bitbake/lib/bb/fetch2/osc.py
index 8f091efd02..3a6cd29510 100644
--- a/bitbake/lib/bb/fetch2/osc.py
+++ b/bitbake/lib/bb/fetch2/osc.py
@@ -8,12 +8,15 @@ Based on the svn "Fetch" implementation.
8""" 8"""
9 9
10import logging 10import logging
11import os
11import bb 12import bb
12from bb.fetch2 import FetchMethod 13from bb.fetch2 import FetchMethod
13from bb.fetch2 import FetchError 14from bb.fetch2 import FetchError
14from bb.fetch2 import MissingParameterError 15from bb.fetch2 import MissingParameterError
15from bb.fetch2 import runfetchcmd 16from bb.fetch2 import runfetchcmd
16 17
18logger = logging.getLogger(__name__)
19
17class Osc(FetchMethod): 20class Osc(FetchMethod):
18 """Class to fetch a module or modules from Opensuse build server 21 """Class to fetch a module or modules from Opensuse build server
19 repositories.""" 22 repositories."""
diff --git a/bitbake/lib/bb/fetch2/ssh.py b/bitbake/lib/bb/fetch2/ssh.py
index 5e982ecf38..2c8557e1f8 100644
--- a/bitbake/lib/bb/fetch2/ssh.py
+++ b/bitbake/lib/bb/fetch2/ssh.py
@@ -31,8 +31,7 @@ IETF secsh internet draft:
31# 31#
32 32
33import re, os 33import re, os
34from bb.fetch2 import FetchMethod 34from bb.fetch2 import check_network_access, FetchMethod, ParameterError, runfetchcmd
35from bb.fetch2 import runfetchcmd
36 35
37 36
38__pattern__ = re.compile(r''' 37__pattern__ = re.compile(r'''
@@ -65,7 +64,7 @@ class SSH(FetchMethod):
65 64
66 def urldata_init(self, urldata, d): 65 def urldata_init(self, urldata, d):
67 if 'protocol' in urldata.parm and urldata.parm['protocol'] == 'git': 66 if 'protocol' in urldata.parm and urldata.parm['protocol'] == 'git':
68 raise bb.fetch2.ParameterError( 67 raise ParameterError(
69 "Invalid protocol - if you wish to fetch from a git " + 68 "Invalid protocol - if you wish to fetch from a git " +
70 "repository using ssh, you need to use " + 69 "repository using ssh, you need to use " +
71 "git:// prefix with protocol=ssh", urldata.url) 70 "git:// prefix with protocol=ssh", urldata.url)
@@ -105,7 +104,7 @@ class SSH(FetchMethod):
105 dldir 104 dldir
106 ) 105 )
107 106
108 bb.fetch2.check_network_access(d, cmd, urldata.url) 107 check_network_access(d, cmd, urldata.url)
109 108
110 runfetchcmd(cmd, d) 109 runfetchcmd(cmd, d)
111 110