Commits

Tom Tanner committed 219774a

fix test issues

  • Participants
  • Parent commits 92d2e93

Comments (0)

Files changed (2)

src/engine/SCons/Script/Main.py

                (EnvironmentError, SCons.Errors.StopError,
                             SCons.Errors.UserError))):
             type, value, trace = buildError.exc_info
-            if tb: traceback.print_tb(tb, file=sys.stderr) #added by TT
+            if print_stacktrace and tb:
+                traceback.print_tb(tb, file=sys.stderr) #added by TT
             traceback.print_exception(type, value, trace)
         elif tb and print_stacktrace:
             sys.stderr.write("scons: internal stack trace:\n")
         try:
             prof.runcall(_main, parser)
         finally:
-			prof.dump_stats(options.profile_file)
+            prof.dump_stats(options.profile_file)
     else:
         _main(parser)
 

src/engine/SCons/Script/SConsOptions.py

 class SConsOptionGroup(optparse.OptionGroup):
     """
     A subclass for SCons-specific option groups.
-    
+
     The only difference between this and the base class is that we print
     the group's help text flush left, underneath their own title but
     lined up with the normal "SCons Options".
     def add_local_option(self, *args, **kw):
         """
         Adds a local option to the parser.
-        
+
         This is initiated by a SetOption() call to add a user-defined
         command-line option.  We add the option to a separate option
         group for the local options, creating the group if necessary.
         out liking:
 
         --  add our own regular expression that doesn't break on hyphens
-            (so things like --no-print-directory don't get broken); 
+            (so things like --no-print-directory don't get broken);
 
         --  wrap the list of options themselves when it's too long
             (the wrapper.fill(opts) call below);
- 
+
         --  set the subsequent_indent when wrapping the help_text.
         """
         # The help for each option consists of two parts:
                   action="store_true",
                   help="Do not retrieve built targets from CacheDir.")
 
+    op.add_option('--cache-force', '--cache-populate',
+                  dest='cache_force', default=False,
+                  action="store_true",
+                  help="Copy already-built targets into the CacheDir.")
+
     op.add_option('--cache-readonly',
                   dest='cache_readonly', default=False,
                   action="store_true",
                   help="Do not update CacheDir with built targets.")
 
-    op.add_option('--cache-force', '--cache-populate',
-                  dest='cache_force', default=False,
-                  action="store_true",
-                  help="Copy already-built targets into the CacheDir.")
-
     op.add_option('--cache-show',
                   dest='cache_show', default=False,
                   action="store_true",