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

Unified Diff: chrome/installer/util/product.cc

Issue 551783003: Silence logging at uninstall if the ClientState key doesn't exist. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: logic flip Created 6 years, 3 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/product.cc
diff --git a/chrome/installer/util/product.cc b/chrome/installer/util/product.cc
index c7f1b8f49d5a17de785074e9ff759ceb6eacd5dd..96a42e34a4f1f2e9be9dee0834cac17dfc5317c9 100644
--- a/chrome/installer/util/product.cc
+++ b/chrome/installer/util/product.cc
@@ -117,16 +117,18 @@ bool Product::SetMsiMarker(bool system_install, bool set) const {
RegKey client_state_key;
LONG result = client_state_key.Open(reg_root,
distribution_->GetStateKey().c_str(),
- KEY_READ | KEY_WRITE | KEY_WOW64_32KEY);
+ KEY_SET_VALUE | KEY_WOW64_32KEY);
if (result == ERROR_SUCCESS) {
result = client_state_key.WriteValue(google_update::kRegMSIField,
set ? 1 : 0);
}
-
- LOG_IF(ERROR, result != ERROR_SUCCESS) << "Failed to Open or Write MSI value"
- "to client state key. error: " << result;
-
- return (result == ERROR_SUCCESS);
+ if (result != ERROR_SUCCESS && result != ERROR_FILE_NOT_FOUND) {
+ LOG(ERROR)
+ << "Failed to Open or Write MSI value to client state key. error: "
+ << result;
+ return false;
+ }
+ return true;
}
bool Product::ShouldCreateUninstallEntry() const {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698