From 02913a53a4d3a0b79400d79819d376691eb75a12 Mon Sep 17 00:00:00 2001 From: "maruel@chromium.org" Date: Wed, 25 Aug 2010 20:50:50 +0000 Subject: [PATCH] Blacklist --non-interactive on MacOSX It's broken on 10.5.2. TEST=gcl works all the time on Mac TBR=nsylvain Review URL: http://codereview.chromium.org/3169044 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@57381 0039d316-1c4b-4281-b951-d872f2087c98 --- gcl.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gcl.py b/gcl.py index efe72f833..0230c6222 100755 --- a/gcl.py +++ b/gcl.py @@ -143,8 +143,15 @@ def GetCachedFile(filename, max_age=60*60*24*3, use_root=False): # 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