Changeset 6346efd in mainline

Timestamp:

2009-03-08T16:08:18Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

db4ce845

Parents:

b0b5628

Message:

handle the Done (dialog) button before doing anything else

File:

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

tools/config.py

@@ -417 +417 @@
                                 return 'Configuration canceled'
                         
-                        if (value == 0):
-                                read_preconfigured(PRECONF, MAKEFILE, screen, defaults)
-                                position = 1
-                                continue
-                        
-                        position = None
-                        if (not opt2row.has_key(value)):
-                                raise RuntimeError("Error selecting value: %s" % value)
-                        
-                        (selname, seltype, name, choices) = opt2row[value]
-                        
-                        if (not defaults.has_key(selname)):
-                                        default = None
-                        else:
-                                default = defaults[selname]
-                        
                         if (button == 'done'):
                                 if (check_choices(defaults, ask_names)):
@@ -439 +423 @@
                                         xtui.error_dialog(screen, 'Error', 'Some options have still undefined values. These options are marked with the "?" sign.')
                                         continue
+                        
+                        if (value == 0):
+                                read_preconfigured(PRECONF, MAKEFILE, screen, defaults)
+                                position = 1
+                                continue
+                        
+                        position = None
+                        if (not opt2row.has_key(value)):
+                                raise RuntimeError("Error selecting value: %s" % value)
+                        
+                        (selname, seltype, name, choices) = opt2row[value]
+                        
+                        if (not defaults.has_key(selname)):
+                                        default = None
+                        else:
+                                default = defaults[selname]
                         
                         if (seltype == 'choice'):