rtems/rtems-source-builder
1
0
Fork 0
mirror of https://git.rtems.org/rtems-source-builder synced 2024-10-09 07:15:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

sb: Fix the if logic for parameters.

Browse Source
This commit is contained in:
Chris Johns 2014-08-23 13:26:24 +00:00
parent f022f82886
commit 2b4cd57ed8
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source-builder/sb/config.py
View File

@ -402,6 +402,7 @@ class file:
else: else:
cmd = s[2:-1] cmd = s[2:-1]
exit_code, proc, output = e.shell(cmd) exit_code, proc, output = e.shell(cmd)
log.trace('shell-output: %d %s' % (exit_code, output))
if exit_code == 0: if exit_code == 0:
line = line.replace(s, output) line = line.replace(s, output)
else: else:
@ -785,7 +786,15 @@ class file:
istrue = True istrue = True
else: else:
self._error('invalid if bool operator: ' + reduce(add, ls, '')) self._error('invalid if bool operator: ' + reduce(add, ls, ''))
elif len(ifls) == 3: else:
if len(ifls) > 3:
for op in ['==', '!=', '>=', '=>', '=<', '<=', '>', '<']:
ops = s.split(op)
if len(ops) == 2:
ifls = (ops[0], op, ops[1])
break
if len(ifls) != 3:
self._error('malformed if: ' + reduce(add, ls, ''))
if ifls[1] == '==': if ifls[1] == '==':
if ifls[0] == ifls[2]: if ifls[0] == ifls[2]:
istrue = True istrue = True
@ -818,8 +827,6 @@ class file:
istrue = False istrue = False
else: else:
self._error('invalid %if operator: ' + reduce(add, ls, '')) self._error('invalid %if operator: ' + reduce(add, ls, ''))
else:
self._error('malformed if: ' + reduce(add, ls, ''))
if invert: if invert:
istrue = not istrue istrue = not istrue
log.trace('config: %s: _if: %s %s' % (self.name, ifls, str(istrue))) log.trace('config: %s: _if: %s %s' % (self.name, ifls, str(istrue)))