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.
This commit is contained in:
Chris Johns 2016-03-11 12:39:34 +11:00
parent 84ed68588b
commit e70a165d6d

View File

@ -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):