Changeset c79d50d in mainline

Timestamp:

2009-03-08T12:15:33Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

4d29d01

Parents:

71385d4f

Message:

indicate undefined configuration options more explicitly
(the "None" was not clear enought and might get confused with "none" value)

Location:

tools

Files:

• config.py (modified) (3 diffs)
• xtui.py (modified) (1 diff)

tools/config.py

@@ -338 +338 @@
                                                 continue
                                         
-                                        options.append("     %s [%s] --> " % (name, default))
+                                        if (default == None):
+                                                options.append("?     %s --> " % name)
+                                        else:
+                                                options.append("      %s [%s] --> " % (name, default))
                                 elif (vartype == 'y'):
                                         defaults[varname] = '*'
@@ -346 +349 @@
                                                 default = 'y'
                                                 defaults[varname] = default
-                                        options.append(" <%s> %s " % (yes_no(default), name))
+                                        options.append("  <%s> %s " % (yes_no(default), name))
                                 elif (vartype == 'n/y'):
                                         if (default == None):
                                                 default = 'n'
                                                 defaults[varname] = default
-                                        options.append(" <%s> %s " % (yes_no(default), name))
+                                        options.append("  <%s> %s " % (yes_no(default), name))
                                 else:
                                         raise RuntimeError("Unknown variable type: %s" % vartype)
@@ -378 +381 @@
                                         break
                                 else:
-                                        xtui.error_dialog(screen, 'Error', 'Some options have still undefined values.')
+                                        xtui.error_dialog(screen, 'Error', 'Some options have still undefined values. These options are marked with the "?" sign.')
                                         continue
                         

tools/xtui.py

@@ -257 +257 @@
         elif (dialog):
                 call_dlg(dlgcmd, '--title', title, '--msgbox', msg, '6', str(width + width_extra))
-        
-        sys.stdout.write("\n%s: %s\n" % (title, msg))
+        else:
+                sys.stdout.write("\n%s: %s\n" % (title, msg))