diff options
| author | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-25 00:29:45 +0000 |
|---|---|---|
| committer | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-25 00:29:45 +0000 |
| commit | e6f778160fbd0c96661fbb7460060141d2465e3d (patch) | |
| tree | 0e0a5b545ca37a579e4e7d7ffb6d95ae0ca9e20e /chrome/installer/util/util_constants.h | |
| parent | 2971824c2750319960a985bdf3b7db97d872f8d9 (diff) | |
| download | chromium_src-e6f778160fbd0c96661fbb7460060141d2465e3d.zip chromium_src-e6f778160fbd0c96661fbb7460060141d2465e3d.tar.gz chromium_src-e6f778160fbd0c96661fbb7460060141d2465e3d.tar.bz2 | |
Fix multi-install update regression.
- adjusted some code to handle the fact that the binaries are in the set of products now
- added new process exit codes for some situations that should never happen (only if we mess up invoking setup.exe, nothing for a user to do, so no new strings)
BUG=138658
TEST=install beta channel chrome then update with only "--multi-install --do-not-launch-chrome --verbose-logging" on the command line. also test single to multi migration of chrome, multi-installs with chrome frame, etc.
Review URL: https://chromiumcodereview.appspot.com/10806086
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148261 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util/util_constants.h')
| -rw-r--r-- | chrome/installer/util/util_constants.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/installer/util/util_constants.h b/chrome/installer/util/util_constants.h index 9a1da32..9cb34b7 100644 --- a/chrome/installer/util/util_constants.h +++ b/chrome/installer/util/util_constants.h @@ -70,17 +70,18 @@ enum InstallStatus { CONFLICTING_CHANNEL_EXISTS, // 39. A multi-install product on a different // update channel exists. READY_MODE_REQUIRES_CHROME, // 40. Chrome Frame in ready-mode requires Chrome - REQUIRES_MULTI_INSTALL, // 41. --multi-install was missing from the + APP_HOST_REQUIRES_MULTI_INSTALL, // 41. --multi-install was missing from the // command line. APPLY_DIFF_PATCH_FAILED, // 42. Failed to apply a diff patch. INCONSISTENT_UPDATE_POLICY, // 43. Inconsistent update policy GP settings. + APP_HOST_REQUIRES_USER_LEVEL, // 44. --system-level is forbidden. + APP_HOST_REQUIRES_BINARIES, // 45. No Chrome binaries at either level. + // Friendly reminder: note the COMPILE_ASSERT below. }; -// If the following compile assert fires it means that the InstallStatus -// enumeration changed which will break the contract between the old -// chrome installed and the new setup.exe that is trying to upgrade. -COMPILE_ASSERT(installer::INCONSISTENT_UPDATE_POLICY == 43, +// Existing InstallStatus values must not change. Always add to the end. +COMPILE_ASSERT(installer::APP_HOST_REQUIRES_BINARIES == 45, dont_change_enum); // The type of an update archive. |