Chromium Code Reviews| Index: gclient_scm.py |
| diff --git a/gclient_scm.py b/gclient_scm.py |
| index af74b754d187d37ae87d7c26c1b0cff4c670cd81..ab397987c62256b890cbbf4d4c2ffa5890e49306 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]) |
|
kustermann
2013/08/14 12:12:55
We call 'scm.SVN.CaptureStatus()' with cwd=self.ch
|
| + if os.path.isabs(d[1]): |
|
kustermann
2013/08/14 12:12:55
AFAIK "d[1]" will always be relative. I added this
iannucci
2013/08/15 19:28:18
Maybe since we don't expect this path to hit at al
kustermann
2013/08/19 07:29:34
Done.
|
| + path_to_remove = d[1] |
| + else: |
| + 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] == '!': |