From 7ed2835f8ea4e1026420752dd068e82f8ad10bb5 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Sat, 13 Apr 2013 10:41:40 +1000 Subject: [PATCH] Hack in sources and print the macros when tracing. --- source-builder/sb/build.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/source-builder/sb/build.py b/source-builder/sb/build.py index e118b0d..2eae9e4 100644 --- a/source-builder/sb/build.py +++ b/source-builder/sb/build.py @@ -235,9 +235,12 @@ class build: def source(self, package, source_tag): # # Scan the sources found in the config file for the one we are - # after. Infos or tags are lists. + # after. Infos or tags are lists. Merge in any macro defined + # sources as these may be overridden by user loaded macros. # sources = package.sources() + for sm in self.macros.find('source[0-9]*'): + sources[sm] = [self.macros[sm]] url = None for s in sources: tag = s[len('source'):] @@ -464,6 +467,10 @@ class build: _notice(self.opts, 'package: (Cxc) %s' % (name)) else: _notice(self.opts, 'package: %s' % (name)) + if self.opts.trace(): + print '---- macro maps', '-' * 55 + print self.config.macros + print '-' * 70 self.script.reset() self.script.append(self.config.expand('%{___build_template}')) self.script.append('echo "=> ' + name + ':"')