diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-10 00:33:42 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-10 00:33:42 +0000 |
| commit | 0756b454ebf4d7988191d302fce0752ff29fb7fe (patch) | |
| tree | a4e2eb9cd93eefa379c4d826e08a3ad9dca065d0 /chrome/installer/setup/setup_main.cc | |
| parent | 7806b3cfc15a32f3847088f09528afd5c6f98cd1 (diff) | |
| download | chromium_src-0756b454ebf4d7988191d302fce0752ff29fb7fe.zip chromium_src-0756b454ebf4d7988191d302fce0752ff29fb7fe.tar.gz chromium_src-0756b454ebf4d7988191d302fce0752ff29fb7fe.tar.bz2 | |
Fix problem whereby the "-full" magic value is removed from the "ap" value when a differential update for CF fails (it should remain unless the update succeeds).
Also, fix problem with installer return codes being squashed. This was a regression introduced in http://src.chromium.org/viewvc/chrome?view=rev&revision=41322.
BUG=46051,40607
TEST=Cause a differential update to fail, observe that the "ap" value contains a "-full".
Review URL: http://codereview.chromium.org/2773002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49346 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/setup/setup_main.cc')
| -rw-r--r-- | chrome/installer/setup/setup_main.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc index c86a95a..c32b2af 100644 --- a/chrome/installer/setup/setup_main.cc +++ b/chrome/installer/setup/setup_main.cc @@ -742,7 +742,7 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE prev_instance, // Note that we allow the status installer_util::UNINSTALL_REQUIRES_REBOOT // to pass through, since this is only returned on uninstall which is never // invoked directly by Google Update. - dist->GetInstallReturnCode(install_status); + return_code = dist->GetInstallReturnCode(install_status); } LOG(INFO) << "Installation complete, returning: " << return_code; |