Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(337)

Unified Diff: src/platform/update_engine/update_attempter.cc

Issue 2044001: AU: Minor fixes to get it to do full update on real device (Closed) Base URL: ssh://git@chromiumos-git/chromeos
Patch Set: fixes for review Created 10 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/platform/update_engine/update_attempter.cc
diff --git a/src/platform/update_engine/update_attempter.cc b/src/platform/update_engine/update_attempter.cc
index e12fed9fb4324069484a7d66f4e42bbf11a1beee..ad3bd9eaab8eca6d55767c38673b3e4793b0e30f 100644
--- a/src/platform/update_engine/update_attempter.cc
+++ b/src/platform/update_engine/update_attempter.cc
@@ -70,14 +70,18 @@ void UpdateAttempter::Update(bool force_full_update) {
// Bond them together. We have to use the leaf-types when calling
// BondActions().
- BondActions(request_prep_action.get(), update_check_action.get());
- BondActions(update_check_action.get(), response_handler_action.get());
- BondActions(response_handler_action.get(), filesystem_copier_action.get());
+ BondActions(request_prep_action.get(),
+ update_check_action.get());
+ BondActions(update_check_action.get(),
+ response_handler_action.get());
BondActions(response_handler_action.get(),
+ filesystem_copier_action.get());
+ BondActions(filesystem_copier_action.get(),
kernel_filesystem_copier_action.get());
BondActions(kernel_filesystem_copier_action.get(),
download_action.get());
- BondActions(download_action.get(), postinstall_runner_action_precommit.get());
+ BondActions(download_action.get(),
+ postinstall_runner_action_precommit.get());
BondActions(postinstall_runner_action_precommit.get(),
set_bootable_flag_action.get());
BondActions(set_bootable_flag_action.get(),
@@ -96,15 +100,7 @@ void UpdateAttempter::ProcessingDone(const ActionProcessor* processor,
return;
}
if (!success) {
- if (!full_update_) {
- LOG(ERROR) << "Update failed. Attempting full update";
- actions_.clear();
- response_handler_action_.reset();
- Update(true);
- return;
- } else {
- LOG(ERROR) << "Full update failed. Aborting";
- }
+ LOG(INFO) << "Update failed.";
}
g_main_loop_quit(loop_);
}

Powered by Google App Engine
This is Rietveld 408576698