Index: gclient_scm.py |
diff --git a/gclient_scm.py b/gclient_scm.py |
index ce616816c1b822f1865006316055dba96601992a..28aa43b964fb91d032c42e1b71302748d9fb7067 100644 |
--- a/gclient_scm.py |
+++ b/gclient_scm.py |
@@ -370,10 +370,15 @@ class SVNWrapper(SCMWrapper): |
except EnvironmentError: |
logging.error('Failed to remove %s.' % file_path) |
- # svn revert is so broken we don't even use it. Using |
- # "svn up --revision BASE" achieve the same effect. |
- RunSVNAndGetFileList(options, ['update', '--revision', 'BASE'], path, |
- file_list) |
+ try: |
+ # svn revert is so broken we don't even use it. Using |
+ # "svn up --revision BASE" achieve the same effect. |
+ RunSVNAndGetFileList(options, ['update', '--revision', 'BASE'], path, |
+ file_list) |
+ except OSError, e: |
+ # Maybe the directory disapeared meanwhile. We don't want it to throw an |
+ # exception. |
+ logging.error('Failed to update:\n%s' % str(e)) |
def runhooks(self, options, args, file_list): |
self.status(options, args, file_list) |