summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Wessel <jason.wessel@windriver.com>2012-09-17 17:43:51 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-24 15:35:30 +0100
commit86cf6daff907aed4d14e55b91d2033e6cb0b3925 (patch)
treec8e22c458bfa980c31b026615af110759a718089
parent6e0713a3e7765bafebd48e33b943f83ac17720ea (diff)
downloadpoky-86cf6daff907aed4d14e55b91d2033e6cb0b3925.tar.gz
poky-86cf6daff907aed4d14e55b91d2033e6cb0b3925.tar.bz2
poky-86cf6daff907aed4d14e55b91d2033e6cb0b3925.zip
terminal: Send LogExecTTY event to spawn screen
Bitbake has the ability to request to run a command and if it is not possible fall back to emitting a log message. This can be used to start a screen client automatically on the controling tty if the UI has an interactive tty. (From OE-Core rev: 39193bdce698b6339c3d7643eb3c1fcd2246fd56) Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/terminal.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py
index 352a28239a..71d8a43410 100644
--- a/meta/lib/oe/terminal.py
+++ b/meta/lib/oe/terminal.py
@@ -96,9 +96,14 @@ class Screen(Terminal):
def __init__(self, sh_cmd, title=None, env=None, d=None):
s_id = "devshell_%i" % os.getpid()
self.command = "screen -D -m -t \"{title}\" -S %s {command}" % s_id
- Terminal.__init__(self, sh_cmd, title, env)
- logger.warn('Screen started. Please connect in another terminal with '
- '"screen -r devshell %s"' % s_id)
+ Terminal.__init__(self, sh_cmd, title, env, d)
+ msg = 'Screen started. Please connect in another terminal with ' \
+ '"screen -r %s"' % s_id
+ if (d):
+ bb.event.fire(bb.event.LogExecTTY(msg, "screen -r %s" % s_id,
+ 0.5, 10), d)
+ else:
+ logger.warn(msg)
def prioritized():