From 029f19bd3d4dc09fb48bf6e5322d48bb84c4eb34 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 11 Feb 2011 22:08:21 +0000 Subject: bitbake/fetch2: Add explict network access exception and handling to give users usable error messages Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch2/bzr.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bitbake/lib/bb/fetch2/bzr.py') diff --git a/bitbake/lib/bb/fetch2/bzr.py b/bitbake/lib/bb/fetch2/bzr.py index bb175662b4..454961eff0 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) -- cgit v1.2.3-54-g00ecf