(fixes buildbot#686) always do a clobber when retrying a VC operation

djmitche · Jan 17, 2010 · c99f51d · c99f51d
1 parent 9428693
commit c99f51d
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/buildbot/slave/commands.py b/buildbot/slave/commands.py
@@ -1568,7 +1568,9 @@ def maybeDoVCRetry(self, res):
                 self.sendStatus({'header': msg + "\n"})
                 log.msg(msg)
                 d = defer.Deferred()
-                self.maybeClobber(d)
+                # we are going to do a full checkout, so a clobber is
+                # required first
+                self.doClobber(d, self.workdir)
                 d.addCallback(lambda res: self.doVCFull())
                 d.addBoth(self.maybeDoVCRetry)
                 reactor.callLater(delay, d.callback, None)