Chromium Code Reviews| Index: scripts/slave/chromium_commands.py |
| diff --git a/scripts/slave/chromium_commands.py b/scripts/slave/chromium_commands.py |
| index 9115a5698a6549e20e98262a7ac8e2bcbdc151ad..ee719b95ba5b9e4754624eeba6712c442a4ec98f 100644 |
| --- a/scripts/slave/chromium_commands.py |
| +++ b/scripts/slave/chromium_commands.py |
| @@ -245,6 +245,7 @@ class GClient(SourceBaseCommand): |
| self.project = None |
| # TODO(maruel): Remove once buildbot 0.8.4p1 conversion is complete. |
| self.sourcedata = None |
| + self.do_nothing = None |
| chromium_utils.GetParentClass(GClient).__init__(self, *args, **kwargs) |
| def setup(self, args): |
| @@ -289,8 +290,21 @@ class GClient(SourceBaseCommand): |
| self.sourcedatafile = os.path.join(self.builder.basedir, |
| self.srcdir, |
| ".buildbot-sourcedata") |
| + self.do_nothing = os.path.isfile(os.path.join(self.builder.basedir, |
| + self.srcdir, |
|
iannucci
2014/02/08 01:31:31
I'm assuming srcdir is actually 'build'?
Ryan Tseng
2014/02/08 01:52:21
Presumably, its used that way in all the other par
|
| + 'update.flag')) |
| + |
| + d = defer.succeed(0) |
| + |
| + if self.do_nothing: |
| + # If bot update is run, we don't need to run the traditional update step. |
| + msg = 'update.flag file found: bot_update has run and checkout is \n' |
| + msg += 'already in a consistent state.\n' |
| + msg += 'No actions will be performed in this step.' |
| + self.sendStatus({'header': msg}) |
| + d.addCallback(self._sendRC) |
| + return d |
| - d = defer.succeed(None) |
| # Do we need to clobber anything? |
| if self.mode in ("copy", "clobber", "export"): |
| d.addCallback(self.doClobber, self.workdir) |