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

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

Issue 1881001: AU: Many minor cleanup changes (Closed) Base URL: ssh://git@chromiumos-git/chromeos
Patch Set: fixes for review Created 10 years, 8 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/main.cc
diff --git a/src/platform/update_engine/main.cc b/src/platform/update_engine/main.cc
index a796a983a01fd9e0b535e9cedc896503b205d2fe..4725967fbdd11cdf4f10c5832aa6560ec27d795e 100644
--- a/src/platform/update_engine/main.cc
+++ b/src/platform/update_engine/main.cc
@@ -29,7 +29,9 @@ namespace chromeos_update_engine {
gboolean SetupInMainLoop(void* arg) {
// TODO(adlr): Tell update_attempter to start working.
// Comment this in for that:
- //UpdateAttempter* update_attempter = reinterpret_cast<UpdateAttempter*>(arg);
+ UpdateAttempter* update_attempter = reinterpret_cast<UpdateAttempter*>(arg);
+ LOG(INFO) << "Starting update!";
+ update_attempter->Update(false);
return FALSE; // Don't call this callback function again
}
@@ -59,7 +61,6 @@ void SetupDbusService(UpdateEngineService* service) {
if (request_name_ret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
g_warning("Got result code %u from requesting name", request_name_ret);
g_error_free(error);
- exit(1);
LOG(FATAL) << "Got result code " << request_name_ret
<< " from requesting name, but expected "
<< DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER;
« no previous file with comments | « src/platform/update_engine/download_action.cc ('k') | src/platform/update_engine/omaha_request_prep_action.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698