Fix cbuildbot. Mistakenly used str.open instead of open

bin/cbuildbot.py

 #!/usr/bin/python
 
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import errno
 import optparse
 import os
 import shutil
 import subprocess
 import sys
 
 from cbuildbot_config import config
 
-_DEFAULT_RETRIES=3
+_DEFAULT_RETRIES = 3
 
 # Utility functions
 
 def RunCommand(cmd, print_cmd=True, error_ok=False, error_message=None,
                exit_code=False, redirect_stdout=False, redirect_stderr=False,
                cwd=None, input=None):
   # Print out the command before running.
   if print_cmd:
     print >> sys.stderr, "CBUILDBOT -- RunCommand:", ' '.join(cmd)
   if redirect_stdout:
@@ skipping 34 matching lines @@
       if rw_checkout:
         # Always re-run in case of new git repos or repo sync
         # failed in a previous run because of a forced Stop Build.
         RunCommand(['repo', 'forall', '-c', 'git', 'config',
                     'url.ssh://git@gitrw.chromium.org:9222.pushinsteadof',
                     'http://src.chromium.org/git'], cwd=buildroot)
       retries = 0
     except:
       retries -= 1
       if retries > 0:
-        print >>sys.stderr, 'CBUILDBOT -- Repo Sync Failed, retrying'
+        print >> sys.stderr, 'CBUILDBOT -- Repo Sync Failed, retrying'
       else:
-        print >>sys.stderr, 'CBUILDBOT -- Retries exhausted'
+        print >> sys.stderr, 'CBUILDBOT -- Retries exhausted'
         raise
 
 # Main functions
 
 def _FullCheckout(buildroot, rw_checkout=True, retries=_DEFAULT_RETRIES):
   RunCommand(['sudo', 'rm', '-rf', buildroot])
   MakeDir(buildroot, parents=True)
   RunCommand(['repo', 'init', '-u', 'http://src.chromium.org/git/manifest'],
              cwd=buildroot, input='\n\ny\n')
   RepoSync(buildroot, rw_checkout, retries)
@@ skipping 17 matching lines @@
 
 def _UprevAllPackages(buildroot):
   cwd = os.path.join(buildroot, 'src', 'scripts')
   RunCommand(['./enter_chroot.sh', '--', './cros_mark_all_as_stable',
               '--tracking_branch="cros/master"'],
              cwd=cwd)
 
 def _UprevPackages(buildroot, revisionfile):
   revisions = None
   if (revisionfile):
-    rev_file = revisionfile.open(revisionfile)
-    revisions = rev_file.read()
-    rev_file.close()
+    try:
+      rev_file = open(revisionfile)
+      revisions = rev_file.read()
+      rev_file.close()
+    except:
+      print >> sys.stderr, 'Error reading %s' % revisionfile
+      revisions = None
 
   # Note:  Revisions == "None" indicates a Force Build.
   if revisions and revisions != 'None':
     print 'CBUILDBOT - Revision list found %s' % revisions
     print 'Revision list not yet propagating to build, marking all instead'
 
   _UprevAllPackages(buildroot)
 
 def _UprevCleanup(buildroot):
   cwd = os.path.join(buildroot, 'src', 'scripts')
@@ skipping 61 matching lines @@
       _UprevPush(buildroot)
       _UprevCleanup(buildroot)
   except:
     # something went wrong, cleanup (being paranoid) for next build
     if clobber:
       RunCommand(['sudo', 'rm', '-rf', buildroot], print_cmd=False)
     raise
 
 if __name__ == '__main__':
     main()