From 52561d9d95493f8a2869fa86601af2f081850f6f Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Fri, 11 Mar 2016 12:39:34 +1100 Subject: 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): -- cgit v1.2.3