commit fdfd1e37ae81f0283ecfaabcb738a54c5d5b0c68
author xixuan <xixuan@chromium.org> Thu Oct 06 14:55:17 2016 -0700
committer chrome-bot <chrome-bot@chromium.org> Thu Oct 06 23:32:49 2016 -0700
tree 270715088f4a33a86efe3fa0c47dcd4cf3cf85e4
parent f08fe49d197cab22a912d68ecd076ad89b0e2cca

Devserver: make touch provision_failed as the first action in provision

This CL make 'touch /var/tmp/provision_failed' as the first action in CrOS
Auto-Update flow.

BUG=chromium:653368
TEST=Run repair in local autotest.

Change-Id: I29a47ac4735ad559f1fff5133d1efabe9aa5e435
Reviewed-on: https://chromium-review.googlesource.com/394888
Commit-Ready: Aviv Keshet <akeshet@chromium.org>
Tested-by: Aviv Keshet <akeshet@chromium.org>
Reviewed-by: Aviv Keshet <akeshet@chromium.org>

cros_update.py

diff --git a/cros_update.py b/cros_update.py
index 6bf3e3f..d969220 100644
--- a/cros_update.py
+++ b/cros_update.py
@@ -175,13 +175,14 @@
             yes=True)
         chromeos_AU.CheckPayloads()
 
+        version_match = chromeos_AU.PreSetupCrOSUpdate()
         self._WriteAUStatus('Transfer Devserver/Stateful Update Package')
         chromeos_AU.TransferDevServerPackage()
         chromeos_AU.TransferStatefulUpdate()
 
         restore_stateful = chromeos_AU.CheckRestoreStateful()
         do_stateful_update = (not self.full_update) and (
-            chromeos_AU.PreSetupCrOSUpdate() and self.force_update)
+            version_match and self.force_update)
         stateful_update_complete = False
         logging.debug('Start CrOS update process...')
         try: