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

Unified Diff: chrome/installer/setup/install_worker.cc

Issue 8299008: Errors while deleting old version dirs no longer cause them to grow in odd ways. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addresses nits Created 9 years, 2 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 | chrome/installer/util/delete_tree_work_item.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/setup/install_worker.cc
diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc
index 4bcb43723ebeb5b6793faae90d8025ff1b1100ef..8fe481852d5e5d357fde113950f0c8bb22c66985 100644
--- a/chrome/installer/setup/install_worker.cc
+++ b/chrome/installer/setup/install_worker.cc
@@ -754,9 +754,10 @@ void AddInstallWorkItems(const InstallationState& original_state,
target_path.Append(installer::kDictionaries).value(),
temp_path.value(), WorkItem::IF_NOT_PRESENT);
- // Delete any old_chrome.exe if present.
+ // Delete any old_chrome.exe if present (ignore failure if it's in use).
install_list->AddDeleteTreeWorkItem(
- target_path.Append(installer::kChromeOldExe), temp_path);
+ target_path.Append(installer::kChromeOldExe), temp_path)
+ ->set_ignore_failure(true);
// Copy installer in install directory and
// add shortcut in Control Panel->Add/Remove Programs.
« no previous file with comments | « no previous file | chrome/installer/util/delete_tree_work_item.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698