Changeset 7aef7ee in mainline

Timestamp:

2009-02-20T15:52:07Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

dc22844

Parents:

70554dd

Message:

use three-state logic for deduced defaults

File:

• tools/config.py (modified) (4 diffs)

tools/config.py

@@ -104 +104 @@
                 else:
                         varval = defaults[condname]
+                        if (varval == '*'):
+                                varval = 'y'
                 
                 if (ctype == 'cnf'):
@@ -250 +252 @@
                 else:
                         default = defaults[varname]
+                        if (default == '*'):
+                                default = 'y'
                 
                 outmk.write('# %s\n%s = %s\n\n' % (name, varname, default))
@@ -303 +307 @@
                         # Cancel out all defaults which have to be deduced
                         for varname, vartype, name, choices, cond in ask_names:
-                                if (vartype == 'y'):
+                                if ((vartype == 'y') and (defaults.has_key(varname)) and (defaults[varname] == '*')):
                                         defaults[varname] = None
                         
@@ -336 +340 @@
                                         options.append("     %s [%s] --> " % (name, default))
                                 elif (vartype == 'y'):
-                                        defaults[varname] = 'y'
+                                        defaults[varname] = '*'
                                         continue
                                 elif (vartype == 'y/n'):