aboutsummaryrefslogtreecommitdiff
path: root/setup_links.py
diff options
context:
space:
mode:
authorHenrik Kjellander <kjellander@webrtc.org>2015-04-29 11:27:22 +0200
committerHenrik Kjellander <kjellander@webrtc.org>2015-04-29 09:27:29 +0000
commitc444de627656ffaef2d97285eb55656cc866cc6e (patch)
tree7a66c72020b71aa481944bcbcd6f926bfb7cec6e /setup_links.py
parent1ba344a07060bf57db649299835ec4f093d58d40 (diff)
downloadwebrtc-c444de627656ffaef2d97285eb55656cc866cc6e.tar.gz
Make setup_links.py handle non-link directories during cleanup
The trybots ended up in a state that could not be cleaned up when other tryjobs were altering the checkout with different variations of dependencies. TBR=pbos@webrtc.org Review URL: https://webrtc-codereview.appspot.com/46139004 Cr-Commit-Position: refs/heads/master@{#9110}
Diffstat (limited to 'setup_links.py')
-rwxr-xr-xsetup_links.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/setup_links.py b/setup_links.py
index e5e3477018..ed8b923db1 100755
--- a/setup_links.py
+++ b/setup_links.py
@@ -348,7 +348,8 @@ class WebRTCLinkSetup():
if not self._dry_run:
if os.path.exists(link_path):
if sys.platform.startswith('win') and os.path.isdir(link_path):
- subprocess.check_call(['rmdir', '/q', link_path], shell=True)
+ subprocess.check_call(['rmdir', '/q', '/s', link_path],
+ shell=True)
else:
os.remove(link_path)
del self._links_db[source]