diff options
Diffstat (limited to 'bitbake/lib/bb/fetch/bzr.py')
-rw-r--r-- | bitbake/lib/bb/fetch/bzr.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/bitbake/lib/bb/fetch/bzr.py b/bitbake/lib/bb/fetch/bzr.py index 813d7d8c80..8b0bd9ff3a 100644 --- a/bitbake/lib/bb/fetch/bzr.py +++ b/bitbake/lib/bb/fetch/bzr.py | |||
@@ -25,11 +25,10 @@ BitBake 'Fetch' implementation for bzr. | |||
25 | 25 | ||
26 | import os | 26 | import os |
27 | import sys | 27 | import sys |
28 | import logging | ||
28 | import bb | 29 | import bb |
29 | from bb import data | 30 | from bb import data |
30 | from bb.fetch import Fetch | 31 | from bb.fetch import Fetch, FetchError, runfetchcmd, logger |
31 | from bb.fetch import FetchError | ||
32 | from bb.fetch import runfetchcmd | ||
33 | 32 | ||
34 | class Bzr(Fetch): | 33 | class Bzr(Fetch): |
35 | def supports(self, url, ud, d): | 34 | def supports(self, url, ud, d): |
@@ -93,16 +92,16 @@ class Bzr(Fetch): | |||
93 | 92 | ||
94 | if os.access(os.path.join(ud.pkgdir, os.path.basename(ud.pkgdir), '.bzr'), os.R_OK): | 93 | if os.access(os.path.join(ud.pkgdir, os.path.basename(ud.pkgdir), '.bzr'), os.R_OK): |
95 | bzrcmd = self._buildbzrcommand(ud, d, "update") | 94 | bzrcmd = self._buildbzrcommand(ud, d, "update") |
96 | bb.msg.debug(1, bb.msg.domain.Fetcher, "BZR Update %s" % loc) | 95 | logger.debug(1, "BZR Update %s", loc) |
97 | os.chdir(os.path.join (ud.pkgdir, os.path.basename(ud.path))) | 96 | os.chdir(os.path.join (ud.pkgdir, os.path.basename(ud.path))) |
98 | runfetchcmd(bzrcmd, d) | 97 | runfetchcmd(bzrcmd, d) |
99 | else: | 98 | else: |
100 | os.system("rm -rf %s" % os.path.join(ud.pkgdir, os.path.basename(ud.pkgdir))) | 99 | os.system("rm -rf %s" % os.path.join(ud.pkgdir, os.path.basename(ud.pkgdir))) |
101 | bzrcmd = self._buildbzrcommand(ud, d, "fetch") | 100 | bzrcmd = self._buildbzrcommand(ud, d, "fetch") |
102 | bb.msg.debug(1, bb.msg.domain.Fetcher, "BZR Checkout %s" % loc) | 101 | logger.debug(1, "BZR Checkout %s", loc) |
103 | bb.mkdirhier(ud.pkgdir) | 102 | bb.mkdirhier(ud.pkgdir) |
104 | os.chdir(ud.pkgdir) | 103 | os.chdir(ud.pkgdir) |
105 | bb.msg.debug(1, bb.msg.domain.Fetcher, "Running %s" % bzrcmd) | 104 | logger.debug(1, "Running %s", bzrcmd) |
106 | runfetchcmd(bzrcmd, d) | 105 | runfetchcmd(bzrcmd, d) |
107 | 106 | ||
108 | os.chdir(ud.pkgdir) | 107 | os.chdir(ud.pkgdir) |
@@ -130,7 +129,7 @@ class Bzr(Fetch): | |||
130 | """ | 129 | """ |
131 | Return the latest upstream revision number | 130 | Return the latest upstream revision number |
132 | """ | 131 | """ |
133 | bb.msg.debug(2, bb.msg.domain.Fetcher, "BZR fetcher hitting network for %s" % url) | 132 | logger.debug(2, "BZR fetcher hitting network for %s", url) |
134 | 133 | ||
135 | output = runfetchcmd(self._buildbzrcommand(ud, d, "revno"), d, True) | 134 | output = runfetchcmd(self._buildbzrcommand(ud, d, "revno"), d, True) |
136 | 135 | ||