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

Unified Diff: gclient_scm.py

Issue 255083: Fix a specific failure when reverting embedded directories. (Closed)
Patch Set: Created 11 years, 2 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: 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)
« 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