Commits

Tom Tanner  committed 3c522e7

and again

  • Participants
  • Parent commits c0a5f75

Comments (0)

Files changed (1)

File src/engine/SCons/Script/SConsOptions.py

         for o in value.split(','):
             if o in debug_options:
                 parser.values.debug.append(o)
-                if value in deprecated_debug_options.keys():
-                    try:
-                        parser.values.delayed_warnings
-                    except AttributeError:
-                        parser.values.delayed_warnings = []
-                    msg = deprecated_debug_options[value]
-                    w = "The --debug=%s option is deprecated%s." % (o, msg)
-                    t = (SCons.Warnings.DeprecatedDebugOptionsWarning, w)
-                    parser.values.delayed_warnings.append(t)
+            elif value in deprecated_debug_options.keys():
+				parser.values.debug.append(o)
+				try:
+					parser.values.delayed_warnings
+				except AttributeError:
+					parser.values.delayed_warnings = []
+				msg = deprecated_debug_options[value]
+				w = "The --debug=%s option is deprecated%s." % (o, msg)
+				t = (SCons.Warnings.DeprecatedDebugOptionsWarning, w)
+				parser.values.delayed_warnings.append(t)
             else:
                 raise OptionValueError("Warning:  %s is not a valid debug type" % o)
     opt_debug_help = "Print various types of debugging information: %s." \
         try:
             diskcheck_value = diskcheck_convert(value)
         except ValueError, e:
-            raise OptionValueError("Warning: `%s' is not a valid diskcheck type" % e)
+            raise OptionValueError("%s' is not a valid diskcheck type" % e)
         setattr(parser.values, option.dest, diskcheck_value)
 
     op.add_option('--diskcheck',