From fa653c2ce240b28740b32393c810e705acf8af0d Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Tue, 12 Mar 2013 18:30:15 +1100 Subject: Use the new opts define and add an undefine. --- source-builder/sb/setbuilder.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'source-builder/sb/setbuilder.py') diff --git a/source-builder/sb/setbuilder.py b/source-builder/sb/setbuilder.py index 2dbbcce..4477e7e 100644 --- a/source-builder/sb/setbuilder.py +++ b/source-builder/sb/setbuilder.py @@ -214,11 +214,15 @@ class buildset: 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:]])) + self.opts.define(self.defaults, + ls[1].strip(), + ' '.join([f.strip() for f in ls[2:]])) else: - self.defaults[ls[1].strip()] = ('none', 'none', '1') + self.opts.define(self.defaults, ls[1].strip()) + elif ls[0] == '%undefine': + if len(ls) > 2: + raise error.general('%undefine requires just the name') + self.opts.undefine(self.defaults, ls[1].strip()) elif ls[0] == '%include': configs += self.parse(ls[1].strip()) else: -- cgit v1.2.3