Make gclient pack work again by not prefixing "thread_id>"

gclient.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Meta checkout manager supporting both Subversion and GIT.
 
 Files
   .gclient      : Current client configuration, written by 'config' command.
                   Format is a Python script defining 'solutions', a list whose
@@ skipping 1553 matching lines @@
   if sys.hexversion < 0x02060000:
     print >> sys.stderr, (
         '\nYour python version %s is unsupported, please upgrade.\n' %
         sys.version.split(' ', 1)[0])
     return 2
   colorama.init()
   try:
     # Make stdout auto-flush so buildbot doesn't kill us during lengthy
     # operations. Python as a strong tendency to buffer sys.stdout.
     sys.stdout = gclient_utils.MakeFileAutoFlush(sys.stdout)
-    # Make stdout annotated with the thread ids.
-    sys.stdout = gclient_utils.MakeFileAnnotated(sys.stdout)
     # Do it late so all commands are listed.
     # Unused variable 'usage'
     # pylint: disable=W0612
     def to_str(fn):
       return (
           '  %s%-10s%s' % (Fore.GREEN, fn[3:], Fore.RESET) +
           ' %s' % Command(fn[3:]).__doc__.split('\n')[0].strip())
     cmds = (
         to_str(fn) for fn in dir(sys.modules[__name__]) if fn.startswith('CMD')
     )
     CMDhelp.usage = '\n\nCommands are:\n' + '\n'.join(cmds)
     parser = Parser()
     if argv:
+      if not argv[0] in ('diff', 'pack'):
+        # Make stdout annotated with the thread ids.
+        sys.stdout = gclient_utils.MakeFileAnnotated(sys.stdout)
       command = Command(argv[0])
       if command:
         # 'fix' the usage and the description now that we know the subcommand.
         GenUsage(parser, argv[0])
         return command(parser, argv[1:])
     # Not a known command. Default to help.
     GenUsage(parser, 'help')
     return CMDhelp(parser, argv)
   except (gclient_utils.Error, subprocess2.CalledProcessError), e:
     print >> sys.stderr, 'Error: %s' % str(e)
     return 1
 
 
 if '__main__' == __name__:
   fix_encoding.fix_encoding()
   sys.exit(Main(sys.argv[1:]))
 
 # vim: ts=2:sw=2:tw=80:et: