276,23 → 276,21 |
oper = res.group(2) |
condval = res.group(3) |
if condname not in seen_vars: |
varval = '' |
## raise RuntimeError("Variable %s not defined before being asked." %\ |
## condname) |
elif not defaults.has_key(condname): |
raise RuntimeError("Variable %s not defined before being asked." %\ |
condname) |
if not defaults.has_key(condname): |
raise RuntimeError("Condition var %s does not exist: %s" % \ |
(condname,text)) |
else: |
varval = defaults[condname] |
|
if ctype == 'cnf': |
if oper == '=' and condval == varval: |
if oper == '=' and condval == defaults[condname]: |
return True |
if oper == '!=' and condval != varval: |
if oper == '!=' and condval != defaults[condname]: |
return True |
else: |
if oper== '=' and condval != varval: |
if oper== '=' and condval != defaults[condname]: |
return False |
if oper== '!=' and condval == varval: |
if oper== '!=' and condval == defaults[condname]: |
return False |
if ctype=='cnf': |
return False |