From mboxrd@z Thu Jan 1 00:00:00 1970 From: Roger Meier Date: Thu, 7 Aug 2014 16:19:58 +0200 Subject: [U-Boot] [PATCH v3] tools: genboardscfg.py, no exception if columns undetectable In-Reply-To: <20140807214753.96F1.AA925319@jp.panasonic.com> References: <20140807214753.96F1.AA925319@jp.panasonic.com> Message-ID: <1407421198-16295-1-git-send-email-roger@bufferoverflow.ch> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de The existing terminalsize detection raised an exception on build server. Just removes the exception. This also deactivates the progress indicator. Remove a trainling whitespace. Signed-off-by: Roger Meier CC: Masahiro Yamada CC: Tom Rini --- Changes for v2: - use 24 instead of 25 lines Changes for v3: - return integer with 0 columns instead of tuple, this also deactivates the progress indicator --- tools/genboardscfg.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/genboardscfg.py b/tools/genboardscfg.py index 734d90b..cd9e69c 100755 --- a/tools/genboardscfg.py +++ b/tools/genboardscfg.py @@ -58,8 +58,6 @@ def get_terminal_columns(): try: ret = fcntl.ioctl(sys.stdout.fileno(), termios.TIOCGWINSZ, arg) except IOError as exception: - if exception.errno != errno.ENOTTY: - raise # If 'Inappropriate ioctl for device' error occurs, # stdout is probably redirected. Return 0. return 0 @@ -408,7 +406,7 @@ def __gen_boards_cfg(jobs): jobs: The number of jobs to run simultaneously Note: - The incomplete boards.cfg is left over when an error (including + The incomplete boards.cfg is left over when an error (including the termination by the keyboard interrupt) occurs on the halfway. """ check_top_directory() -- 1.7.10.4