Patchwork [CONSOLIDATED,PULL,01/17] cml1.bbclass: Only delay exit if the command fails

login
mail settings
Submitter Saul Wold
Date June 22, 2012, 10 p.m.
Message ID <b6748ff02cd7d4433894571b42533edf4ac6a541.1340402353.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/30499/
State Accepted
Commit d99cc2b70bbda9a0cbc09a4430b871c287113041
Headers show

Comments

Saul Wold - June 22, 2012, 10 p.m.
From: Darren Hart <dvhart@linux.intel.com>

Rather than pause for 5 seconds, test the return code of the command and
require user input before exiting on failure. This avoids pausing after
successful command execution as well as possibly not waiting long enough
if the user happens to be doing something else for 5 seconds.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
 meta/classes/cml1.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Patch

diff --git a/meta/classes/cml1.bbclass b/meta/classes/cml1.bbclass
index fd80c18..67f17ad 100644
--- a/meta/classes/cml1.bbclass
+++ b/meta/classes/cml1.bbclass
@@ -20,7 +20,7 @@  python do_menuconfig() {
         except OSError:
             mtime = 0
 
-        oe_terminal("${SHELL} -c \"make menuconfig; echo 'Pausing for 5 seconds'; sleep 5\"", '${PN} Configuration', d)
+        oe_terminal("${SHELL} -c \"make menuconfig; if [ $? -ne 0 ]; then echo 'Command failed.'; echo -n 'Press any key to continue... '; read r; fi\"", '${PN} Configuration', d)
 
         # FIXME this check can be removed when the minimum bitbake version has been bumped
         if hasattr(bb.build, 'write_taint'):