Blacklist --non-interactive on MacOSX

gcl.py

 #!/usr/bin/python
 # Copyright (c) 2006-2009 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.
 
 """\
 Wrapper script around Rietveld's upload.py that simplifies working with groups
 of files.
 """
 
@@ skipping 125 matching lines @@
       while True:
         # Look in the repository at the current level for the file.
         for _ in range(5):
           content = ""
           try:
             # Take advantage of the fact that svn won't output to stderr in case
             # of success but will do in case of failure so don't mind putting
             # stderr into content_array.
             content_array = []
             svn_path = url_path + "/" + filename
-            SVN.RunAndFilterOutput(['cat', svn_path, '--non-interactive'],
-                                   cwd='.', filter_fn=content_array.append)
+            args = ['cat', svn_path]
+            if sys.platform != 'darwin':
+              # MacOSX 10.5.2 has a bug with svn 1.4.4 that will trigger the
+              # 'Can\'t get username or password' and can be fixed easily.
+              # The fix doesn't work if the user upgraded to svn 1.6.x. Bleh.
+              # I don't have time to fix their broken stuff.
+              args.append('--non-interactive')
+            SVN.RunAndFilterOutput(args, cwd='.',
+                                   filter_fn=content_array.append)
             # Exit the loop if the file was found. Override content.
             content = '\n'.join(content_array)
             break
           except gclient_utils.Error:
             if content_array[0].startswith(
                 'svn: Can\'t get username or password'):
               ErrorExit('Your svn credentials expired. Please run svn update '
                         'to fix the cached credentials')
             if content_array[0].startswith('svn: Can\'t get password'):
               ErrorExit('If are using a Mac and svn --version shows 1.4.x, '
@@ skipping 1155 matching lines @@
     if command:
       return command(argv[1:])
     # Unknown command, try to pass that to svn
     return CMDpassthru(argv)
   except gclient_utils.Error, e:
     print('Got an exception')
     print(str(e))
 
 if __name__ == "__main__":
   sys.exit(main(sys.argv[1:]))