Notice: We have migrated to GitLab launching 2024-05-01 see here: https://gitlab.rtems.org/

Ticket #3209: 0001-sb-config-Terminate-building-on-an-error.patch

File 0001-sb-config-Terminate-building-on-an-error.patch, 1.4 KB (added by Chris Johns, on 04/10/18 at 08:03:19)

Terminate a build patch.

  • source-builder/sb/config.py

    From 162cbda055624472ef817b7a9b6ccd65cf97e155 Mon Sep 17 00:00:00 2001
    From: Chris Johns <chrisj@rtems.org>
    Date: Tue, 10 Apr 2018 17:59:48 +1000
    Subject: [PATCH] sb/config: Terminate building on an error.
    
    This changes the previous functionality where the RSB switch to
    dry run mode. This functionality can be enabled by adding
    `--keep-going`.
    
    Close #3209.
    ---
     source-builder/sb/config.py | 14 ++++++++------
     1 file changed, 8 insertions(+), 6 deletions(-)
    
    diff --git a/source-builder/sb/config.py b/source-builder/sb/config.py
    index a4f739b..74c002e 100644
    a b class file: 
    312312            log.output(text)
    313313
    314314    def _error(self, msg):
    315         err = 'error: %s' % (self._name_line_msg(msg))
    316         log.stderr(err)
    317         log.output(err)
    318         self.in_error = True
    319315        if not self.opts.dry_run():
    320             log.stderr('warning: switched to dry run due to errors')
    321             self.opts.set_dry_run()
     316            if self.opts.keep_going():
     317                err = 'error: %s' % (self._name_line_msg(msg))
     318                log.stderr(err)
     319                log.output(err)
     320                self.in_error = True
     321                log.stderr('warning: switched to dry run due to errors')
     322                self.opts.set_dry_run()
     323        raise error.general(self._name_line_msg(msg))
    322324
    323325    def _label(self, name):
    324326        if name.startswith('%{') and name[-1] is '}':