[rtems-source-builder commit] bootstrap: Do not create a log file by default.

Chris Johns chrisj at rtems.org
Wed May 10 00:41:25 UTC 2017


Module:    rtems-source-builder
Branch:    master
Commit:    f99c37eb0ad77676bf866961ffb784113b4743f6
Changeset: http://git.rtems.org/rtems-source-builder/commit/?id=f99c37eb0ad77676bf866961ffb784113b4743f6

Author:    Chris Johns <chrisj at rtems.org>
Date:      Wed May 10 10:41:19 2017 +1000

bootstrap: Do not create a log file by default.

---

 source-builder/sb/bootstrap.py |  2 +-
 source-builder/sb/options.py   | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/source-builder/sb/bootstrap.py b/source-builder/sb/bootstrap.py
index c9acf5c..9095f3c 100644
--- a/source-builder/sb/bootstrap.py
+++ b/source-builder/sb/bootstrap.py
@@ -268,7 +268,7 @@ def run(args):
         optargs = { '--rtems':       'The RTEMS source directory',
                     '--preinstall':  'Preinstall AM generation' }
         log.notice('RTEMS Source Builder - RTEMS Bootstrap, %s' % (version.str()))
-        opts = options.load(sys.argv, optargs)
+        opts = options.load(sys.argv, optargs, logfile = False)
         if opts.get_arg('--rtems'):
             topdir = opts.get_arg('--rtems')
         else:
diff --git a/source-builder/sb/options.py b/source-builder/sb/options.py
index 089d5a7..51407a4 100644
--- a/source-builder/sb/options.py
+++ b/source-builder/sb/options.py
@@ -265,9 +265,13 @@ class command_line:
                 self.opts['params'].append(a)
             arg += 1
 
-    def post_process(self):
+    def post_process(self, logfile = True):
         # Handle the log first.
-        log.default = log.log(self.logfiles())
+        if logfile:
+            logfiles = self.logfiles()
+        else:
+            logfiles = None
+        log.default = log.log(streams = logfiles)
         if self.trace():
             log.tracing = True
         if self.quiet():
@@ -561,7 +565,7 @@ class command_line:
             self.args.append('--target=%s-rtems%s' % (ab[0], rtems_version))
             self.args.append('--with-rtems-bsp=%s' % (ab[1]))
 
-def load(args, optargs = None, defaults = '%{_sbdir}/defaults.mc'):
+def load(args, optargs = None, defaults = '%{_sbdir}/defaults.mc', logfile = True):
     """
     Copy the defaults, get the host specific values and merge them overriding
     any matching defaults, then create an options object to handle the command
@@ -638,7 +642,7 @@ def load(args, optargs = None, defaults = '%{_sbdir}/defaults.mc'):
     o.sb_git()
     o.rtems_options()
     o.process()
-    o.post_process()
+    o.post_process(logfile)
 
     #
     # Load the release settings



More information about the vc mailing list