Index: native_client_sdk/src/build_tools/build_sdk.py |
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py |
index 925eb74c8eda19cb240b2f5eaa72822bce78727c..c03afb03c488c88681966b8d266ac5aa3b63ae96 100755 |
--- a/native_client_sdk/src/build_tools/build_sdk.py |
+++ b/native_client_sdk/src/build_tools/build_sdk.py |
@@ -806,6 +806,14 @@ def BuildStepArchiveSDKTools(): |
def BuildStepSyncNaClPorts(): |
"""Pull the pinned revision of naclports from SVN.""" |
buildbot_common.BuildStep('Sync naclports') |
+ |
+ # In case a previous svn checkout exists, remove it. |
+ # TODO(sbc): remove this once all the build machines |
+ # have removed the old checkout |
+ if (os.path.exists(NACLPORTS_DIR) and |
+ not os.path.exists(os.path.join(NACLPORTS_DIR, '.git'))): |
+ buildbot_common.RemoveDir(NACLPORTS_DIR) |
+ |
if not os.path.exists(NACLPORTS_DIR): |
# checkout new copy of naclports |
cmd = ['git', 'clone', NACLPORTS_URL, 'naclports'] |