summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2018-07-19 13:47:18 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-26 13:16:40 +0100
commit869e501544960f638edfe17c9d7500b54d05837e (patch)
treef6967d2d1648f92fd2ec780b02971e0eb8f4c2e4 /meta
parent53b50b5d11dfd6f299116edc7254ebc1f29f19e5 (diff)
downloadpoky-869e501544960f638edfe17c9d7500b54d05837e.tar.gz
logging: use warning instead warn
The warn method is deprecated. We should use the documented warning instead. Quoting from the python's official doc: """ Note: There is an obsolete method warn which is functionally identical to warning. As warn is deprecated, please do not use it - use warning instead. """ (From OE-Core rev: f467fd277eb77336097cfc0f5f329bdc8d0f70cb) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oe/terminal.py6
-rw-r--r--meta/lib/oeqa/selftest/context.py2
-rw-r--r--meta/lib/oeqa/utils/qemurunner.py4
3 files changed, 6 insertions, 6 deletions
diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py
index 94afe394ed..caeb5e31ec 100644
--- a/meta/lib/oe/terminal.py
+++ b/meta/lib/oe/terminal.py
@@ -112,7 +112,7 @@ class Screen(Terminal):
112 bb.event.fire(bb.event.LogExecTTY(msg, "screen -r %s" % s_id, 112 bb.event.fire(bb.event.LogExecTTY(msg, "screen -r %s" % s_id,
113 0.5, 10), d) 113 0.5, 10), d)
114 else: 114 else:
115 logger.warn(msg) 115 logger.warning(msg)
116 116
117class TmuxRunning(Terminal): 117class TmuxRunning(Terminal):
118 """Open a new pane in the current running tmux window""" 118 """Open a new pane in the current running tmux window"""
@@ -168,7 +168,7 @@ class Tmux(Terminal):
168 if d: 168 if d:
169 bb.event.fire(bb.event.LogExecTTY(msg, attach_cmd, 0.5, 10), d) 169 bb.event.fire(bb.event.LogExecTTY(msg, attach_cmd, 0.5, 10), d)
170 else: 170 else:
171 logger.warn(msg) 171 logger.warning(msg)
172 172
173class Custom(Terminal): 173class Custom(Terminal):
174 command = 'false' # This is a placeholder 174 command = 'false' # This is a placeholder
@@ -180,7 +180,7 @@ class Custom(Terminal):
180 if not '{command}' in self.command: 180 if not '{command}' in self.command:
181 self.command += ' {command}' 181 self.command += ' {command}'
182 Terminal.__init__(self, sh_cmd, title, env, d) 182 Terminal.__init__(self, sh_cmd, title, env, d)
183 logger.warn('Custom terminal was started.') 183 logger.warning('Custom terminal was started.')
184 else: 184 else:
185 logger.debug(1, 'No custom terminal (OE_TERMINAL_CUSTOMCMD) set') 185 logger.debug(1, 'No custom terminal (OE_TERMINAL_CUSTOMCMD) set')
186 raise UnsupportedTerminal('OE_TERMINAL_CUSTOMCMD not set') 186 raise UnsupportedTerminal('OE_TERMINAL_CUSTOMCMD not set')
diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py
index c937b8171c..16812ba96e 100644
--- a/meta/lib/oeqa/selftest/context.py
+++ b/meta/lib/oeqa/selftest/context.py
@@ -156,7 +156,7 @@ class OESelftestTestContextExecutor(OETestContextExecutor):
156 os.chdir(builddir) 156 os.chdir(builddir)
157 157
158 if not "meta-selftest" in self.tc.td["BBLAYERS"]: 158 if not "meta-selftest" in self.tc.td["BBLAYERS"]:
159 self.tc.logger.warn("meta-selftest layer not found in BBLAYERS, adding it") 159 self.tc.logger.warning("meta-selftest layer not found in BBLAYERS, adding it")
160 meta_selftestdir = os.path.join( 160 meta_selftestdir = os.path.join(
161 self.tc.td["BBLAYERS_FETCH_DIR"], 'meta-selftest') 161 self.tc.td["BBLAYERS_FETCH_DIR"], 'meta-selftest')
162 if os.path.isdir(meta_selftestdir): 162 if os.path.isdir(meta_selftestdir):
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index c962602a63..c8bd6516cf 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -384,7 +384,7 @@ class QemuRunner:
384 # qemu-system behaves well and a SIGTERM is enough 384 # qemu-system behaves well and a SIGTERM is enough
385 os.kill(self.qemupid, signal.SIGTERM) 385 os.kill(self.qemupid, signal.SIGTERM)
386 except ProcessLookupError as e: 386 except ProcessLookupError as e:
387 self.logger.warn('qemu-system ended unexpectedly') 387 self.logger.warning('qemu-system ended unexpectedly')
388 388
389 def stop_thread(self): 389 def stop_thread(self):
390 if self.thread and self.thread.is_alive(): 390 if self.thread and self.thread.is_alive():
@@ -461,7 +461,7 @@ class QemuRunner:
461 461
462 def _dump_host(self): 462 def _dump_host(self):
463 self.host_dumper.create_dir("qemu") 463 self.host_dumper.create_dir("qemu")
464 self.logger.warn("Qemu ended unexpectedly, dump data from host" 464 self.logger.warning("Qemu ended unexpectedly, dump data from host"
465 " is in %s" % self.host_dumper.dump_dir) 465 " is in %s" % self.host_dumper.dump_dir)
466 self.host_dumper.dump_host() 466 self.host_dumper.dump_host()
467 467