Fix private issues, take two.

apply_issue.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.
 
 """Applies an issue from Rietveld.
 """
 
 import getpass
 import logging
@@ skipping 69 matching lines @@
   except urllib2.HTTPError, e:
     if e.getcode() != 302:
       raise
     # TODO(maruel): A few 'Invalid username or password.' are printed first, we
     # should get rid of those.
   except rietveld.upload.ClientLoginError, e:
     # Fine, we'll do proper authentication.
     pass
   if properties is None:
     if options.email is not None:
+      obj = rietveld.Rietveld(options.server, options.email, options.password)
       try:
-        obj = rietveld.Rietveld(options.server, options.email, options.password)
+        properties = obj.get_issue_properties(options.issue, False)
       except rietveld.upload.ClientLoginError, e:
         if sys.stdout.closed:
           print('Accessing the issue requires proper credentials.')
           return 1
-    print('Accessing the issue requires login.')
-    obj = rietveld.Rietveld(options.server, None, None)
-    properties = obj.get_issue_properties(options.issue, False)
+    else:
+      print('Accessing the issue requires login.')
+      obj = rietveld.Rietveld(options.server, None, None)
+      try:
+        properties = obj.get_issue_properties(options.issue, False)
+      except rietveld.upload.ClientLoginError, e:
+        print('Accessing the issue requires proper credentials.')
+        return 1
 
   if not options.patchset:
     options.patchset = properties['patchsets'][-1]
     print('No patchset specified. Using patchset %d' % options.patchset)
 
   print('Downloading the patch.')
   try:
     patchset = obj.get_patch(options.issue, options.patchset)
   except urllib2.HTTPError, e:
     print(
@@ skipping 44 matching lines @@
       if sys.platform == 'win32':
         gclient_path += '.bat'
       return subprocess.call(
           [gclient_path, 'sync', '--revision', base_rev], cwd=gclient_root)
   return 0
 
 
 if __name__ == "__main__":
   fix_encoding.fix_encoding()
   sys.exit(main())