summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/fetch2/bzr.py
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-11 22:08:21 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-11 22:08:21 +0000
commit029f19bd3d4dc09fb48bf6e5322d48bb84c4eb34 (patch)
treec4738712f08cb91326bea57aff156c31c289e21e /bitbake/lib/bb/fetch2/bzr.py
parent4a226460d5e158e8adbf74a68717cb9a923e8009 (diff)
downloadpoky-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/bzr.py')
-rw-r--r--bitbake/lib/bb/fetch2/bzr.py6
1 files changed, 3 insertions, 3 deletions
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):
85 if os.access(os.path.join(ud.pkgdir, os.path.basename(ud.pkgdir), '.bzr'), os.R_OK): 85 if os.access(os.path.join(ud.pkgdir, os.path.basename(ud.pkgdir), '.bzr'), os.R_OK):
86 bzrcmd = self._buildbzrcommand(ud, d, "update") 86 bzrcmd = self._buildbzrcommand(ud, d, "update")
87 logger.debug(1, "BZR Update %s", loc) 87 logger.debug(1, "BZR Update %s", loc)
88 bb.fetch2.check_network_access(d, bzrcmd) 88 bb.fetch2.check_network_access(d, bzrcmd, ud.url)
89 os.chdir(os.path.join (ud.pkgdir, os.path.basename(ud.path))) 89 os.chdir(os.path.join (ud.pkgdir, os.path.basename(ud.path)))
90 runfetchcmd(bzrcmd, d) 90 runfetchcmd(bzrcmd, d)
91 else: 91 else:
92 bb.utils.remove(os.path.join(ud.pkgdir, os.path.basename(ud.pkgdir)), True) 92 bb.utils.remove(os.path.join(ud.pkgdir, os.path.basename(ud.pkgdir)), True)
93 bzrcmd = self._buildbzrcommand(ud, d, "fetch") 93 bzrcmd = self._buildbzrcommand(ud, d, "fetch")
94 bb.fetch2.check_network_access(d, bzrcmd) 94 bb.fetch2.check_network_access(d, bzrcmd, ud.url)
95 logger.debug(1, "BZR Checkout %s", loc) 95 logger.debug(1, "BZR Checkout %s", loc)
96 bb.mkdirhier(ud.pkgdir) 96 bb.mkdirhier(ud.pkgdir)
97 os.chdir(ud.pkgdir) 97 os.chdir(ud.pkgdir)
@@ -124,7 +124,7 @@ class Bzr(FetchMethod):
124 """ 124 """
125 logger.debug(2, "BZR fetcher hitting network for %s", url) 125 logger.debug(2, "BZR fetcher hitting network for %s", url)
126 126
127 bb.fetch2.check_network_access(d, self._buildbzrcommand(ud, d, "revno")) 127 bb.fetch2.check_network_access(d, self._buildbzrcommand(ud, d, "revno"), ud.url)
128 128
129 output = runfetchcmd(self._buildbzrcommand(ud, d, "revno"), d, True) 129 output = runfetchcmd(self._buildbzrcommand(ud, d, "revno"), d, True)
130 130