[rtems-source-builder commit] sb: Do not expand the package name in a bset file.

Chris Johns chrisj at rtems.org
Wed Mar 16 06:25:59 UTC 2016


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

Author:    Chris Johns <chrisj at rtems.org>
Date:      Fri Mar 11 12:39:34 2016 +1100

sb: Do not expand the package name in a bset file.

If the package references macros yet to be defined an error is
generated. Let the macro expands happen when the package name is
actually used.

Closes #2645.

---

 source-builder/sb/setbuilder.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source-builder/sb/setbuilder.py b/source-builder/sb/setbuilder.py
index 787b67b..3d20b73 100644
--- a/source-builder/sb/setbuilder.py
+++ b/source-builder/sb/setbuilder.py
@@ -242,7 +242,7 @@ class buildset:
                 log.trace('_bset: %s: %03d: %s' % (self.bset, lc, l))
                 ls = l.split()
                 if ls[0][-1] == ':' and ls[0][:-1] == 'package':
-                    self.bset_pkg = self.macros.expand(ls[1].strip())
+                    self.bset_pkg = ls[1].strip()
                     self.macros['package'] = self.bset_pkg
                 elif ls[0][0] == '%':
                     def err(msg):



More information about the vc mailing list