diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-23 21:26:56 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-23 21:26:56 +0000 |
| commit | fb016f688e4f801a9915b98cdcabca6c1d8a30c4 (patch) | |
| tree | 557b0473c8e1ec6c6635d2efb933168955dd583d | |
| parent | 05122a955a8200935225b14172ad3620997cf760 (diff) | |
| download | chromium_src-fb016f688e4f801a9915b98cdcabca6c1d8a30c4.zip chromium_src-fb016f688e4f801a9915b98cdcabca6c1d8a30c4.tar.gz chromium_src-fb016f688e4f801a9915b98cdcabca6c1d8a30c4.tar.bz2 | |
When applying a full update on a 32-bit-only system, check the bitness of the Chrome that's about to be installed, not the Chrome that's already installed.
BUG=303280
R=thakis@chromium.org
Review URL: https://codereview.chromium.org/133083003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246689 0039d316-1c4b-4281-b951-d872f2087c98
| -rwxr-xr-x | chrome/installer/mac/keystone_install.sh | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/chrome/installer/mac/keystone_install.sh b/chrome/installer/mac/keystone_install.sh index 9eea459..6f08c12 100755 --- a/chrome/installer/mac/keystone_install.sh +++ b/chrome/installer/mac/keystone_install.sh @@ -1035,6 +1035,12 @@ main() { true)" note "old_brand = ${old_brand}" + local update_versioned_dir= + if [[ -z "${is_patch}" ]]; then + update_versioned_dir="${update_app}/${VERSIONS_DIR}/${update_version_app}" + note "update_versioned_dir = ${update_versioned_dir}" + fi + if has_32_bit_only_cpu; then # On a 32-bit-only system, make sure that the update contains 32-bit code. note "system is 32-bit-only" @@ -1043,8 +1049,8 @@ main() { if [[ -z "${is_patch}" ]]; then # For a full installer, the framework is available, so check it for # 32-bit code. - local old_framework_dir="${old_versioned_dir}/${FRAMEWORK_DIR}" - test_binary="${old_framework_dir}/${FRAMEWORK_NAME}" + local update_framework_dir="${update_versioned_dir}/${FRAMEWORK_DIR}" + test_binary="${update_framework_dir}/${FRAMEWORK_NAME}" else # No application code is guaranteed to be available at this point for a # patch updater, but goobspatch is built alongside and will have the @@ -1104,11 +1110,7 @@ main() { rm -f "${new_versioned_dir}" 2> /dev/null || true fi - local update_versioned_dir - if [[ -z "${is_patch}" ]]; then - update_versioned_dir="${update_app}/${VERSIONS_DIR}/${update_version_app}" - note "update_versioned_dir = ${update_versioned_dir}" - else # [[ -n "${is_patch}" ]] + if [[ -n "${is_patch}" ]]; then # dirpatcher won't patch into a directory that already exists. Doing so # would be a bad idea, anyway. If ${new_versioned_dir} already exists, # it may be something left over from a previous failed or incomplete |