summaryrefslogtreecommitdiffstats
path: root/chrome/installer
diff options
context:
space:
mode:
authorgrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-02 01:26:36 +0000
committergrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-02 01:26:36 +0000
commit9091a0863fdea23988156c95a1b0ce983080945b (patch)
treecdeaab117fa4f544037763d171fccb34dcc4027c /chrome/installer
parent8a9f6862bf4f162abed4df31628c61ccc8b6dc4c (diff)
downloadchromium_src-9091a0863fdea23988156c95a1b0ce983080945b.zip
chromium_src-9091a0863fdea23988156c95a1b0ce983080945b.tar.gz
chromium_src-9091a0863fdea23988156c95a1b0ce983080945b.tar.bz2
Clear the installer stage info after patching setup.exe. We're seeing update checks for installs where the machine was left in the ensemble_patching stage. I blieve that in most of these cases, setup.exe was patched without a crash. It's better if we clear the stage so that these cases aren't confused with true crashes while patching.
BUG=none TEST=stage info should be cleared at the conclusion of --update-setup-exe processing. R=robertshield@chromium.org Review URL: http://codereview.chromium.org/6975058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87569 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
-rw-r--r--chrome/installer/setup/setup_main.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc
index 8c25613..a103333 100644
--- a/chrome/installer/setup/setup_main.cc
+++ b/chrome/installer/setup/setup_main.cc
@@ -809,6 +809,8 @@ bool HandleNonInstallCmdLineOptions(const InstallationState& original_state,
installer_state->WriteInstallerResult(status, IDS_SETUP_PATCH_FAILED_BASE,
NULL);
}
+ // We will be exiting normally, so clear the stage indicator.
+ installer_state->UpdateStage(installer::NO_STAGE);
} else if (cmd_line.HasSwitch(installer::switches::kShowEula)) {
// Check if we need to show the EULA. If it is passed as a command line
// then the dialog is shown and regardless of the outcome setup exits here.