Index: gclient_scm.py |
diff --git a/gclient_scm.py b/gclient_scm.py |
index b5e88617367623b7e5fdea5d220ac1fbdebd3550..0a1bbf12deba1d31379ed20726216f5dcfa7725b 100644 |
--- a/gclient_scm.py |
+++ b/gclient_scm.py |
@@ -840,10 +840,12 @@ class SVNWrapper(SCMWrapper): |
for file_status in scm.SVN.CaptureStatus(self.checkout_path): |
file_path = os.path.join(self.checkout_path, file_status[1]) |
- if file_status[0][0] == 'X': |
- # Ignore externals. |
- logging.info('Ignoring external %s' % file_path) |
- continue |
+ # Temporarily forcibly delete externals to make sure chromium can build |
+ # without svn:external's. |
+ #if file_status[0][0] == 'X': |
+ # # Ignore externals. |
+ # logging.info('Ignoring external %s' % file_path) |
+ # continue |
if logging.getLogger().isEnabledFor(logging.INFO): |
logging.info('%s%s' % (file[0], file[1])) |
@@ -916,7 +918,10 @@ class SVNWrapper(SCMWrapper): |
def _RunAndGetFileList(self, args, options, file_list, cwd=None): |
"""Runs a commands that goes to stdout and grabs the file listed.""" |
cwd = cwd or self.checkout_path |
- scm.SVN.RunAndGetFileList(options.verbose, args, cwd=cwd, |
+ scm.SVN.RunAndGetFileList( |
+ options.verbose, |
+ args + ['--ignore-externals'], |
+ cwd=cwd, |
file_list=file_list) |
@staticmethod |