[zorg] r371686 - Run svn cleanup before svn up on Windows annotated build bots

[Reid Kleckner via llvm-commits]

Author: rnk
Date: Wed Sep 11 16:19:45 2019
New Revision: 371686

URL: http://llvm.org/viewvc/llvm-project?rev=371686&view=rev
Log:
Run svn cleanup before svn up on Windows annotated build bots

This should help them recover better form random svn flakiness for
another few months.

Modified:
    zorg/trunk/zorg/buildbot/builders/annotated/annotated_builder.py

Modified: zorg/trunk/zorg/buildbot/builders/annotated/annotated_builder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/annotated/annotated_builder.py?rev=371686&r1=371685&r2=371686&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/annotated/annotated_builder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/annotated/annotated_builder.py Wed Sep 11 16:19:45 2019
@@ -268,9 +268,12 @@ class AnnotatedBuilder:
             elif not os.path.isabs(path):
                 path = pjoin(source_dir, path)
             uri = svn_uri_pattern % (svn_locations.get(project, project),)
+            util.report_run_cmd([svn, 'cleanup'], cwd=path)
             util.report("Updating %s to %s at %s from %s" %
                         (project, revision, util.shquote(path), uri))
             if os.path.exists(pjoin(path, '.svn')):
+                util.report("Cleaning up in case of svn errors...")
+                util.report_run_cmd([svn, 'cleanup'], cwd=path)
                 cmd = [svn, 'up', '-r', revision]
             else:
                 util.mkdirp(path)