diff options
-rwxr-xr-x | bitbake-dev/bin/bitbake | 5 | ||||
-rw-r--r-- | bitbake-dev/lib/bb/ui/ncurses.py | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/bitbake-dev/bin/bitbake b/bitbake-dev/bin/bitbake index 87284c08fe..ea4147e971 100755 --- a/bitbake-dev/bin/bitbake +++ b/bitbake-dev/bin/bitbake | |||
@@ -123,7 +123,6 @@ Default BBFILES are the .bb files in the current directory.""" ) | |||
123 | configuration.pkgs_to_build = [] | 123 | configuration.pkgs_to_build = [] |
124 | configuration.pkgs_to_build.extend(args[1:]) | 124 | configuration.pkgs_to_build.extend(args[1:]) |
125 | 125 | ||
126 | |||
127 | # Work out which UI(s) to use | 126 | # Work out which UI(s) to use |
128 | curseUI = False | 127 | curseUI = False |
129 | depexplorerUI = False | 128 | depexplorerUI = False |
@@ -168,10 +167,6 @@ Default BBFILES are the .bb files in the current directory.""" ) | |||
168 | 167 | ||
169 | # Launch the UI | 168 | # Launch the UI |
170 | try: | 169 | try: |
171 | # Disable UIs that need a terminal | ||
172 | if not os.isatty(sys.stdout.fileno()): | ||
173 | curseUI = False | ||
174 | |||
175 | if curseUI: | 170 | if curseUI: |
176 | try: | 171 | try: |
177 | import curses | 172 | import curses |
diff --git a/bitbake-dev/lib/bb/ui/ncurses.py b/bitbake-dev/lib/bb/ui/ncurses.py index 1476baa61f..866792b14f 100644 --- a/bitbake-dev/lib/bb/ui/ncurses.py +++ b/bitbake-dev/lib/bb/ui/ncurses.py | |||
@@ -324,6 +324,9 @@ class NCursesUI: | |||
324 | pass | 324 | pass |
325 | 325 | ||
326 | def init(server, eventHandler): | 326 | def init(server, eventHandler): |
327 | if not os.isatty(sys.stdout.fileno()): | ||
328 | print "FATAL: Unable to run 'ncurses' UI without a TTY." | ||
329 | return | ||
327 | ui = NCursesUI() | 330 | ui = NCursesUI() |
328 | try: | 331 | try: |
329 | curses.wrapper(ui.main, server, eventHandler) | 332 | curses.wrapper(ui.main, server, eventHandler) |