diff options
Diffstat (limited to 'bitbake/lib/bb/fetch2')
-rw-r--r-- | bitbake/lib/bb/fetch2/osc.py | 3 | ||||
-rw-r--r-- | bitbake/lib/bb/fetch2/ssh.py | 7 |
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 | ||
10 | import logging | 10 | import logging |
11 | import os | ||
11 | import bb | 12 | import bb |
12 | from bb.fetch2 import FetchMethod | 13 | from bb.fetch2 import FetchMethod |
13 | from bb.fetch2 import FetchError | 14 | from bb.fetch2 import FetchError |
14 | from bb.fetch2 import MissingParameterError | 15 | from bb.fetch2 import MissingParameterError |
15 | from bb.fetch2 import runfetchcmd | 16 | from bb.fetch2 import runfetchcmd |
16 | 17 | ||
18 | logger = logging.getLogger(__name__) | ||
19 | |||
17 | class Osc(FetchMethod): | 20 | class 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 | ||
33 | import re, os | 33 | import re, os |
34 | from bb.fetch2 import FetchMethod | 34 | from bb.fetch2 import check_network_access, FetchMethod, ParameterError, runfetchcmd |
35 | from 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 | ||