diff options
| author | Chris Johns <chrisj@rtems.org> | 2013-03-11 10:39:57 +1100 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2013-03-11 10:39:57 +1100 |
| commit | 5cba075c71012e1cdb6ca9f17c414eb7a629680d (patch) | |
| tree | 9f549cbb85b0c3f2b9e0252fe875f5a530666b13 /source-builder/sb/setbuilder.py | |
| parent | Clean up the error message. (diff) | |
| download | rtems-source-builder-5cba075c71012e1cdb6ca9f17c414eb7a629680d.tar.bz2 | |
Improve the parsing in build set files.
Diffstat (limited to 'source-builder/sb/setbuilder.py')
| -rw-r--r-- | source-builder/sb/setbuilder.py | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/source-builder/sb/setbuilder.py b/source-builder/sb/setbuilder.py index 0146153..2dbbcce 100644 --- a/source-builder/sb/setbuilder.py +++ b/source-builder/sb/setbuilder.py @@ -207,22 +207,19 @@ class buildset: continue if self.opts.trace(): print '%03d: %s' % (lc, l) - if ':' in l: - ls = l.split(':') - if ls[0].strip() == 'package': - self.bset_pkg = self.opts.expand(ls[1].strip(), self.defaults) - self.defaults['package'] = ('none', 'none', self.bset_pkg) - elif l[0] == '%': - if l.startswith('%define'): - ls = l.split() + ls = l.split() + if ls[0][-1] == ':' and ls[0][:-1] == 'package': + self.bset_pkg = self.opts.expand(ls[1].strip(), self.defaults) + self.defaults['package'] = ('none', 'none', self.bset_pkg) + elif ls[0][0] == '%': + if ls[0] == '%define': if len(ls) > 2: self.defaults[ls[1].strip()] = ('none', 'none', ' '.join([f.strip() for f in ls[2:]])) else: self.defaults[ls[1].strip()] = ('none', 'none', '1') - elif l.startswith('%include'): - ls = l.split(' ') + elif ls[0] == '%include': configs += self.parse(ls[1].strip()) else: raise error.general('invalid directive in build set files: %s' % (l)) |