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

Unified Diff: gclient_scm.py

Issue 22886004: Bugfix in gclient_scm.py: Remove the correct directories if svn checkout is in a broken state (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Patch Set: Created 7 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: gclient_scm.py
diff --git a/gclient_scm.py b/gclient_scm.py
index af74b754d187d37ae87d7c26c1b0cff4c670cd81..bb719ebf7086de0a0f0721d7bb9948939a1eedef 100644
--- a/gclient_scm.py
+++ b/gclient_scm.py
@@ -1230,8 +1230,13 @@ class SVNWrapper(SCMWrapper):
for d in dir_info:
if d[0][2] == 'L':
if d[0][0] == '!' and options.force:
- print 'Removing troublesome path %s' % d[1]
- gclient_utils.rmtree(d[1])
+ # We don't pass any files/directories to CaptureStatus and set
+ # cwd=self.checkout_path, so we should get relative paths here.
+ assert not os.path.isabs(d[1])
+ path_to_remove = os.path.normpath(
+ os.path.join(self.checkout_path, d[1]))
+ print 'Removing troublesome path %s' % path_to_remove
+ gclient_utils.rmtree(path_to_remove)
else:
print 'Not removing troublesome path %s automatically.' % d[1]
if d[0][0] == '!':
« 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