Changeset c0bd08d in mainline

Timestamp:

2010-12-08T19:43:32Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c01f8e6

Parents:

4006447

Message:

Do not override user choice with a default (thx Vojtech Horky).

File:

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

tools/config.py

@@ -242 +242 @@
                 
                 default = get_default_rule(rule)
-                if default != None:
+
+                #
+                # If we don't have a value but we do have
+                # a default, use it.
+                #
+                if value == None and default != None:
+                        value = default
                         config[varname] = default
                 
@@ -558 +564 @@
                                 
                                 default = get_default_rule(rule)
-                                if default != None:
-                                        if value == None:
+
+                                #
+                                # If we don't have a value but we do have
+                                # a default, use it.
+                                #
+                                if value == None and default != None:
+                                        value = default
+                                        config[varname] = default
+
+                                if value == None:
+                                        if default == None:
                                                 value = default
                                         config[varname] = value