| Index: gclient.py
 | 
| diff --git a/gclient.py b/gclient.py
 | 
| index 7e6b878fcaf6db38fe973e63a9b18c4a278a1dc3..d7f02091c208f75ad3058820e29636dbd135a6e5 100644
 | 
| --- a/gclient.py
 | 
| +++ b/gclient.py
 | 
| @@ -1197,8 +1197,8 @@ def Main(argv):
 | 
|        options.entries_filename = options.config_filename + '_entries'
 | 
|        if options.jobs < 1:
 | 
|          parser.error('--jobs must be 1 or higher')
 | 
| -      # Useful for --jobs.
 | 
| -      options.stdout = sys.stdout
 | 
| +      # Always autoflush so buildbot doesn't kill us during lengthy operations.
 | 
| +      options.stdout = gclient_utils.StdoutAutoFlush(sys.stdout)
 | 
|  
 | 
|        # These hacks need to die.
 | 
|        if not hasattr(options, 'revisions'):
 | 
| 
 |