Skip to content

Commit c5081a8

Browse files
author
Kevin Cernekee
committed
Allow non-critical updates to be triggered from the command line
Commit 2494e28 ("Skip non-critical updates during OOBE update check") added a new requirement: if the omaha response did not specify a deadline, the update would not be applied until OOBE finished. But the lab tests and provisioning processes often do require updates to be applied before OOBE finishes. So we will exempt updates triggered via `update_engine_client --update` from this new requirement, while keeping the requirement for update checks triggered from Chrome. Bug: None BUG=chromium:587101 BUG=chromium:600737 TEST=manually initiate updates from the OOBE flow and from update_engine_client, and watch /var/log/update_engine.log for results TEST=`FEATURES=test emerge-cyan chromeos-base/update_engine` Change-Id: I7671b92d0d0dbb871e8f2c737c01e91cba29fa9d
1 parent 616fd4f commit c5081a8

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

omaha_request_action.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1025,7 +1025,8 @@ void OmahaRequestAction::CompleteProcessing() {
10251025
PayloadStateInterface* payload_state = system_state_->payload_state();
10261026

10271027
if (!system_state_->hardware()->IsOOBEComplete(nullptr) &&
1028-
output_object.deadline.empty()) {
1028+
output_object.deadline.empty() &&
1029+
params_->app_version() != "ForcedUpdate") {
10291030
output_object.update_exists = false;
10301031
LOG(INFO) << "Ignoring non-critical Omaha updates until OOBE is done.";
10311032
completer.set_code(ErrorCode::kNonCriticalUpdateInOOBE);

0 commit comments

Comments
 (0)