Chromium Code Reviews Chromium Code Reviews
Issue 2773002:
Fix problem whereby the "-full" magic value is removed from the "ap" value wh... (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src/| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <string> | 5 #include <string> |
| 6 #include <windows.h> | 6 #include <windows.h> |
| 7 #include <msi.h> | 7 #include <msi.h> |
| 8 #include <shellapi.h> | 8 #include <shellapi.h> |
| 9 #include <shlobj.h> | 9 #include <shlobj.h> |
| 10 | 10 |
| (...skipping 724 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 735 | 735 |
| 736 int return_code = 0; | 736 int return_code = 0; |
| 737 // MSI demands that custom actions always return 0 (ERROR_SUCCESS) or it will | 737 // MSI demands that custom actions always return 0 (ERROR_SUCCESS) or it will |
| 738 // rollback the action. If we're uninstalling we want to avoid this, so always | 738 // rollback the action. If we're uninstalling we want to avoid this, so always |
| 739 // report success, squashing any more informative return codes. | 739 // report success, squashing any more informative return codes. |
| 740 if (!(InstallUtil::IsMSIProcess(system_install) && | 740 if (!(InstallUtil::IsMSIProcess(system_install) && |
| 741 parsed_command_line.HasSwitch(installer_util::switches::kUninstall))) { | 741 parsed_command_line.HasSwitch(installer_util::switches::kUninstall))) { |
| 742 // Note that we allow the status installer_util::UNINSTALL_REQUIRES_REBOOT | 742 // Note that we allow the status installer_util::UNINSTALL_REQUIRES_REBOOT |
| 743 // to pass through, since this is only returned on uninstall which is never | 743 // to pass through, since this is only returned on uninstall which is never |
| 744 // invoked directly by Google Update. | 744 // invoked directly by Google Update. |
| 745 dist->GetInstallReturnCode(install_status); | 745 return_code = dist->GetInstallReturnCode(install_status); |
|
huanr
2010/06/09 23:46:11
So this is a regression by r41322 3 months ago
ht
robertshield
2010/06/10 00:30:30
Yes, it is a regression. I believe this could impa
| |
| 746 } | 746 } |
| 747 | 747 |
| 748 LOG(INFO) << "Installation complete, returning: " << return_code; | 748 LOG(INFO) << "Installation complete, returning: " << return_code; |
| 749 return return_code; | 749 return return_code; |
| 750 } | 750 } |
| OLD | NEW |
