Revert "Rollback: check for can_rollback before performing rollback."
This reverts commit 4c50c54c3cd1b4c9360b27b31aa276b215dcaab9.
Due to: https://code.google.com/p/chromium/issues/detail?id=366508
can_rollback was added in R36. I need to gate this (can_rollback) with a version check.
BUG=chromium:366508
TEST=revert
Change-Id: Id2f6201fd01652895ccfbc6eded3a2356c582fdc
Reviewed-on: https://chromium-review.googlesource.com/196805
Reviewed-by: Chris Sosa <sosa@chromium.org>
Tested-by: Chris Sosa <sosa@chromium.org>
diff --git a/client/common_lib/cros/autoupdater.py b/client/common_lib/cros/autoupdater.py
index f0acc90..abd523a 100644
--- a/client/common_lib/cros/autoupdater.py
+++ b/client/common_lib/cros/autoupdater.py
@@ -319,22 +319,18 @@
@raise RootFSUpdateError if anything went wrong.
"""
- can_rollback_cmd = '%s --can_rollback' % (UPDATER_BIN)
- logging.info('Checking for rollback.')
- try:
- self._run(can_rollback_cmd)
- except error.AutoservRunError as e:
- raise RootFSUpdateError("Rollback isn't possible on %s: %s" %
- (self.host.hostname, str(e)))
-
- rollback_cmd = '%s --rollback --follow' % (UPDATER_BIN)
+ #TODO(sosa): crbug.com/309051 - Make this one update_engine_client call.
+ rollback_cmd = '%s --rollback' % (UPDATER_BIN)
+ wait_for_update_to_complete_cmd = '%s --update' % (UPDATER_BIN)
if not powerwash:
rollback_cmd += ' --nopowerwash'
- logging.info('Performing rollback.')
+ logging.info('Triggering rollback.')
try:
self._run(rollback_cmd)
+ self._run(wait_for_update_to_complete_cmd)
except error.AutoservRunError as e:
+ list_image_dir_contents(self.update_url)
raise RootFSUpdateError('Rollback failed on %s: %s' %
(self.host.hostname, str(e)))