Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1065)

Unified Diff: gcl.py

Issue 3169044: Blacklist --non-interactive on MacOSX (Closed)
Patch Set: rebase against trunk Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gcl.py
diff --git a/gcl.py b/gcl.py
index efe72f833c6b7e457d3b54db40d02207a45e2ce0..0230c6222745824715add32a515dd3f9b827ab6d 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698