summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/fetch2/svn.py
diff options
context:
space:
mode:
authorJoshua Watt <JPEWhacker@gmail.com>2021-02-09 09:50:21 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-10 23:48:16 +0000
commit75f87db413f3659fee18eff389b7b339b01cce15 (patch)
treee733135549b516c72c4f34172b6bbf865377fc76 /bitbake/lib/bb/fetch2/svn.py
parent7283a0b3b6ca49d0d2e13593333a580ef10439a8 (diff)
downloadpoky-75f87db413f3659fee18eff389b7b339b01cce15.tar.gz
bitbake: logging: Make bitbake logger compatible with python logger
The bitbake logger overrode the definition of the debug() logging call to include a debug level, but this causes problems with code that may be using standard python logging, since the extra argument is interpreted differently. Instead, change the bitbake loggers debug() call to match the python logger call and add a debug2() and debug3() API to replace calls that were logging to a different debug level. [RP: Small fix to ensure bb.debug calls bbdebug()] (Bitbake rev: f68682a79d83e6399eb403f30a1f113516575f51) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/fetch2/svn.py')
-rw-r--r--bitbake/lib/bb/fetch2/svn.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/lib/bb/fetch2/svn.py b/bitbake/lib/bb/fetch2/svn.py
index 971a5add4a..8856ef1c62 100644
--- a/bitbake/lib/bb/fetch2/svn.py
+++ b/bitbake/lib/bb/fetch2/svn.py
@@ -116,7 +116,7 @@ class Svn(FetchMethod):
116 def download(self, ud, d): 116 def download(self, ud, d):
117 """Fetch url""" 117 """Fetch url"""
118 118
119 logger.debug(2, "Fetch: checking for module directory '" + ud.moddir + "'") 119 logger.debug2("Fetch: checking for module directory '" + ud.moddir + "'")
120 120
121 lf = bb.utils.lockfile(ud.svnlock) 121 lf = bb.utils.lockfile(ud.svnlock)
122 122
@@ -129,7 +129,7 @@ class Svn(FetchMethod):
129 runfetchcmd(ud.basecmd + " upgrade", d, workdir=ud.moddir) 129 runfetchcmd(ud.basecmd + " upgrade", d, workdir=ud.moddir)
130 except FetchError: 130 except FetchError:
131 pass 131 pass
132 logger.debug(1, "Running %s", svncmd) 132 logger.debug("Running %s", svncmd)
133 bb.fetch2.check_network_access(d, svncmd, ud.url) 133 bb.fetch2.check_network_access(d, svncmd, ud.url)
134 runfetchcmd(svncmd, d, workdir=ud.moddir) 134 runfetchcmd(svncmd, d, workdir=ud.moddir)
135 else: 135 else:
@@ -137,7 +137,7 @@ class Svn(FetchMethod):
137 logger.info("Fetch " + ud.url) 137 logger.info("Fetch " + ud.url)
138 # check out sources there 138 # check out sources there
139 bb.utils.mkdirhier(ud.pkgdir) 139 bb.utils.mkdirhier(ud.pkgdir)
140 logger.debug(1, "Running %s", svncmd) 140 logger.debug("Running %s", svncmd)
141 bb.fetch2.check_network_access(d, svncmd, ud.url) 141 bb.fetch2.check_network_access(d, svncmd, ud.url)
142 runfetchcmd(svncmd, d, workdir=ud.pkgdir) 142 runfetchcmd(svncmd, d, workdir=ud.pkgdir)
143 143