diff options
author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2016-11-21 14:31:43 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-30 15:48:10 +0000 |
commit | 38438b6cf42fb7ad45b9a901f57913af7e7591a3 (patch) | |
tree | 1ea9bd4fa7b7b90fb4a0d4a65235e18062ff2872 /bitbake/lib/bb/fetch2/git.py | |
parent | 4e48892b859b3fe04c8c12b22d8975eed21c086b (diff) | |
download | poky-38438b6cf42fb7ad45b9a901f57913af7e7591a3.tar.gz |
bitbake: fetch2: obey BB_ALLOWED_NETWORKS when checking network access
[YOCTO #10508]
(Bitbake rev: ddd3bc2d64d7240ecb6b6e4a1ae29b1faef6cc22)
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/fetch2/git.py')
-rw-r--r-- | bitbake/lib/bb/fetch2/git.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py index cb9fa3fb1a..f7a0c01868 100644 --- a/bitbake/lib/bb/fetch2/git.py +++ b/bitbake/lib/bb/fetch2/git.py | |||
@@ -252,7 +252,7 @@ class Git(FetchMethod): | |||
252 | repourl = repourl[7:] | 252 | repourl = repourl[7:] |
253 | clone_cmd = "LANG=C %s clone --bare --mirror %s %s --progress" % (ud.basecmd, repourl, ud.clonedir) | 253 | clone_cmd = "LANG=C %s clone --bare --mirror %s %s --progress" % (ud.basecmd, repourl, ud.clonedir) |
254 | if ud.proto.lower() != 'file': | 254 | if ud.proto.lower() != 'file': |
255 | bb.fetch2.check_network_access(d, clone_cmd) | 255 | bb.fetch2.check_network_access(d, clone_cmd, ud.url) |
256 | progresshandler = GitProgressHandler(d) | 256 | progresshandler = GitProgressHandler(d) |
257 | runfetchcmd(clone_cmd, d, log=progresshandler) | 257 | runfetchcmd(clone_cmd, d, log=progresshandler) |
258 | 258 | ||
@@ -384,7 +384,7 @@ class Git(FetchMethod): | |||
384 | cmd = "%s ls-remote %s %s" % \ | 384 | cmd = "%s ls-remote %s %s" % \ |
385 | (ud.basecmd, repourl, search) | 385 | (ud.basecmd, repourl, search) |
386 | if ud.proto.lower() != 'file': | 386 | if ud.proto.lower() != 'file': |
387 | bb.fetch2.check_network_access(d, cmd) | 387 | bb.fetch2.check_network_access(d, cmd, repourl) |
388 | output = runfetchcmd(cmd, d, True) | 388 | output = runfetchcmd(cmd, d, True) |
389 | if not output: | 389 | if not output: |
390 | raise bb.fetch2.FetchError("The command %s gave empty output unexpectedly" % cmd, ud.url) | 390 | raise bb.fetch2.FetchError("The command %s gave empty output unexpectedly" % cmd, ud.url) |