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>2019-04-25 15:01:21 +0100
commit8c7ca97dd6fe790453dee2d245db0594e58c6fbf (patch)
tree1c73877dcef05681e95162cfcbaf29a9475cf194 /meta
parent8dcc23b5cc1d206a74d554ae57a8c1c20358cc03 (diff)
downloadpoky-8c7ca97dd6fe790453dee2d245db0594e58c6fbf.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: cc771aa4b74f222f1bea38b0b50196b2fbc97ab4) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Armin Kuster <akuster808@gmail.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 da7f26b30f..cac9869f10 100644
--- a/meta/lib/oeqa/selftest/context.py
+++ b/meta/lib/oeqa/selftest/context.py
@@ -159,7 +159,7 @@ class OESelftestTestContextExecutor(OETestContextExecutor):
159 os.chdir(builddir) 159 os.chdir(builddir)
160 160
161 if not "meta-selftest" in self.tc.td["BBLAYERS"]: 161 if not "meta-selftest" in self.tc.td["BBLAYERS"]:
162 self.tc.logger.warn("meta-selftest layer not found in BBLAYERS, adding it") 162 self.tc.logger.warning("meta-selftest layer not found in BBLAYERS, adding it")
163 meta_selftestdir = os.path.join( 163 meta_selftestdir = os.path.join(
164 self.tc.td["BBLAYERS_FETCH_DIR"], 'meta-selftest') 164 self.tc.td["BBLAYERS_FETCH_DIR"], 'meta-selftest')
165 if os.path.isdir(meta_selftestdir): 165 if os.path.isdir(meta_selftestdir):
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index 27c4901d12..4864df84dd 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -393,7 +393,7 @@ class QemuRunner:
393 # qemu-system behaves well and a SIGTERM is enough 393 # qemu-system behaves well and a SIGTERM is enough
394 os.kill(self.qemupid, signal.SIGTERM) 394 os.kill(self.qemupid, signal.SIGTERM)
395 except ProcessLookupError as e: 395 except ProcessLookupError as e:
396 self.logger.warn('qemu-system ended unexpectedly') 396 self.logger.warning('qemu-system ended unexpectedly')
397 397
398 def stop_thread(self): 398 def stop_thread(self):
399 if self.thread and self.thread.is_alive(): 399 if self.thread and self.thread.is_alive():
@@ -470,7 +470,7 @@ class QemuRunner:
470 470
471 def _dump_host(self): 471 def _dump_host(self):
472 self.host_dumper.create_dir("qemu") 472 self.host_dumper.create_dir("qemu")
473 self.logger.warn("Qemu ended unexpectedly, dump data from host" 473 self.logger.warning("Qemu ended unexpectedly, dump data from host"
474 " is in %s" % self.host_dumper.dump_dir) 474 " is in %s" % self.host_dumper.dump_dir)
475 self.host_dumper.dump_host() 475 self.host_dumper.dump_host()
476 476