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/bzr.py | |
parent | 4a226460d5e158e8adbf74a68717cb9a923e8009 (diff) | |
download | openembedded-core-029f19bd3d4dc09fb48bf6e5322d48bb84c4eb34.tar.gz openembedded-core-029f19bd3d4dc09fb48bf6e5322d48bb84c4eb34.tar.bz2 openembedded-core-029f19bd3d4dc09fb48bf6e5322d48bb84c4eb34.tar.xz openembedded-core-029f19bd3d4dc09fb48bf6e5322d48bb84c4eb34.zip |
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/bzr.py')
-rw-r--r-- | bitbake/lib/bb/fetch2/bzr.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/lib/bb/fetch2/bzr.py b/bitbake/lib/bb/fetch2/bzr.py index bb175662b..454961eff 100644 --- a/bitbake/lib/bb/fetch2/bzr.py +++ b/bitbake/lib/bb/fetch2/bzr.py @@ -85,13 +85,13 @@ class Bzr(FetchMethod): if os.access(os.path.join(ud.pkgdir, os.path.basename(ud.pkgdir), '.bzr'), os.R_OK): bzrcmd = self._buildbzrcommand(ud, d, "update") logger.debug(1, "BZR Update %s", loc) - bb.fetch2.check_network_access(d, bzrcmd) + bb.fetch2.check_network_access(d, bzrcmd, ud.url) os.chdir(os.path.join (ud.pkgdir, os.path.basename(ud.path))) runfetchcmd(bzrcmd, d) else: bb.utils.remove(os.path.join(ud.pkgdir, os.path.basename(ud.pkgdir)), True) bzrcmd = self._buildbzrcommand(ud, d, "fetch") - bb.fetch2.check_network_access(d, bzrcmd) + bb.fetch2.check_network_access(d, bzrcmd, ud.url) logger.debug(1, "BZR Checkout %s", loc) bb.mkdirhier(ud.pkgdir) os.chdir(ud.pkgdir) @@ -124,7 +124,7 @@ class Bzr(FetchMethod): """ logger.debug(2, "BZR fetcher hitting network for %s", url) - bb.fetch2.check_network_access(d, self._buildbzrcommand(ud, d, "revno")) + bb.fetch2.check_network_access(d, self._buildbzrcommand(ud, d, "revno"), ud.url) output = runfetchcmd(self._buildbzrcommand(ud, d, "revno"), d, True) |