Fix up try job reitveld patch.

scripts/master/try_job_rietveld.py

 # 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.
 
 import hashlib
 import json
+import os
 import time
 import urllib
 import urlparse
 
 from buildbot.changes import base
 from buildbot.schedulers.trysched import BadJobfile
 from twisted.application import internet
 from twisted.internet import defer
 from twisted.python import log
 from twisted.web import client
@@ skipping 38 matching lines @@
     d = defer.succeed(None)
     d.addCallback(self._GetUsers)
     d.addCallback(self._MakeSet)
     d.addErrback(log.err, 'error in ValidUserPoller')
     return d
 
   def _GetUsers(self, _):
     """Downloads list of valid users.
 
     Returns:
-      A frozenset of string containing the email addresses of users allowed to
+      A string of lines containing the email addresses of users allowed to
       send jobs from Rietveld.
     """
-    try:
-      pwd = open(self._PWD_FILE).readline().strip()
-    except IOError:
-      return frozenset([])
+    if not os.path.isfile(self._PWD_FILE):
+      log.msg("No password file %s; no valid users.")
+      return ""
 
+    pwd = open(self._PWD_FILE).readline().strip()
     now_string = str(int(time.time()))
     params = {
       'md5': hashlib.md5(pwd + now_string).hexdigest(),
       'time': now_string
     }
+

[M-A Ruel, 2012/07/19 22:47:23]

This new line is not 100% necessary. :)

     return client.getPage('https://chromium-access.appspot.com/auto/users',
                           agent='buildbot',
                           method='POST',
                           postdata=urllib.urlencode(params))
 
   def _MakeSet(self, data):
     """Converts the input data string into a set of email addresses.
     """
     emails = (email.strip() for email in data.splitlines())
     self._users = frozenset(email for email in emails if email)
@@ skipping 148 matching lines @@
 
     for ex in exceptions:
       log.msg(ex)
 
   # TryJobBase overrides:
   def setServiceParent(self, parent):
     TryJobBase.setServiceParent(self, parent)
     self._poller.setServiceParent(self)
     self._poller.master = self.master
     self._valid_users.setServiceParent(self)