summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorkuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-16 22:41:37 +0000
committerkuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-16 22:41:37 +0000
commit9d6ad02b8c83feeefa57d6131aa4b00cabb9e914 (patch)
treed6df92f2f7d9233e2ef3ecdeccb157f09400a249 /chrome
parentfb4d2aabcd801c55f46769223bd5770d2598c19e (diff)
downloadchromium_src-9d6ad02b8c83feeefa57d6131aa4b00cabb9e914.zip
chromium_src-9d6ad02b8c83feeefa57d6131aa4b00cabb9e914.tar.gz
chromium_src-9d6ad02b8c83feeefa57d6131aa4b00cabb9e914.tar.bz2
Do not set/unset magic string during setup.exe patching step.
BUG=NONE TEST=Make 3 stage updater fail by deleting <chrome>\Application\Installer\chrome.7z file and make sure "ap" key still contains "-full". Review URL: http://codereview.chromium.org/149776 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20912 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/installer/setup/setup_main.cc7
1 files changed, 0 insertions, 7 deletions
diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc
index 05eab49..159f065 100644
--- a/chrome/installer/setup/setup_main.cc
+++ b/chrome/installer/setup/setup_main.cc
@@ -491,11 +491,7 @@ bool HandleNonInstallCmdLineOptions(const CommandLine& cmd_line,
int& exit_code) {
BrowserDistribution* dist = BrowserDistribution::GetDistribution();
if (cmd_line.HasSwitch(installer_util::switches::kUpdateSetupExe)) {
- // First to handle situation where the current process hangs or crashes,
- // we pre-emptively set a flag in registry to get full installer next time.
installer_util::InstallStatus status = installer_util::SETUP_PATCH_FAILED;
- dist->UpdateDiffInstallStatus(system_install, true, status);
-
// If --update-setup-exe command line option is given, we apply the given
// patch to current exe, and store the resulting binary in the path
// specified by --new-setup-exe. But we need to first unpack the file
@@ -552,9 +548,6 @@ bool HandleNonInstallCmdLineOptions(const CommandLine& cmd_line,
}
}
- // If the current patching worked reset the flag set in the registry
- dist->UpdateDiffInstallStatus(system_install, true, status);
-
exit_code = dist->GetInstallReturnCode(status);
if (exit_code) {
LOG(WARNING) << "setup.exe patching failed.";