diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-11 22:08:21 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-11 22:08:21 +0000 |
| commit | 029f19bd3d4dc09fb48bf6e5322d48bb84c4eb34 (patch) | |
| tree | c4738712f08cb91326bea57aff156c31c289e21e /bitbake/lib/bb/fetch2/osc.py | |
| parent | 4a226460d5e158e8adbf74a68717cb9a923e8009 (diff) | |
| download | poky-029f19bd3d4dc09fb48bf6e5322d48bb84c4eb34.tar.gz | |
bitbake/fetch2: Add explict network access exception and handling to give users usable error messages
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/fetch2/osc.py')
| -rw-r--r-- | bitbake/lib/bb/fetch2/osc.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/fetch2/osc.py b/bitbake/lib/bb/fetch2/osc.py index f252b5e4a3..4bf411c24f 100644 --- a/bitbake/lib/bb/fetch2/osc.py +++ b/bitbake/lib/bb/fetch2/osc.py | |||
| @@ -90,7 +90,7 @@ class Osc(FetchMethod): | |||
| 90 | # update sources there | 90 | # update sources there |
| 91 | os.chdir(ud.moddir) | 91 | os.chdir(ud.moddir) |
| 92 | logger.debug(1, "Running %s", oscupdatecmd) | 92 | logger.debug(1, "Running %s", oscupdatecmd) |
| 93 | bb.fetch2.check_network_access(d, oscupdatecmd) | 93 | bb.fetch2.check_network_access(d, oscupdatecmd, ud.url) |
| 94 | runfetchcmd(oscupdatecmd, d) | 94 | runfetchcmd(oscupdatecmd, d) |
| 95 | else: | 95 | else: |
| 96 | oscfetchcmd = self._buildosccommand(ud, d, "fetch") | 96 | oscfetchcmd = self._buildosccommand(ud, d, "fetch") |
| @@ -99,7 +99,7 @@ class Osc(FetchMethod): | |||
| 99 | bb.mkdirhier(ud.pkgdir) | 99 | bb.mkdirhier(ud.pkgdir) |
| 100 | os.chdir(ud.pkgdir) | 100 | os.chdir(ud.pkgdir) |
| 101 | logger.debug(1, "Running %s", oscfetchcmd) | 101 | logger.debug(1, "Running %s", oscfetchcmd) |
| 102 | bb.fetch2.check_network_access(d, oscfetchcmd) | 102 | bb.fetch2.check_network_access(d, oscfetchcmd, ud.url) |
| 103 | runfetchcmd(oscfetchcmd, d) | 103 | runfetchcmd(oscfetchcmd, d) |
| 104 | 104 | ||
| 105 | os.chdir(os.path.join(ud.pkgdir + ud.path)) | 105 | os.chdir(os.path.join(ud.pkgdir + ud.path)) |
