diff options
| author | Michael Moss <mmoss@google.com> | 2016-03-15 14:41:59 -0700 |
|---|---|---|
| committer | Michael Moss <mmoss@google.com> | 2016-03-15 21:44:59 +0000 |
| commit | 91b1c63374309247f624d4aaec0f33a2e901bb7f (patch) | |
| tree | 94862b29aed57f5cf867a1e33a6ee4d10e083787 | |
| parent | 4ab45db88c1cf6b88fac6c422e27d44f2ad942e0 (diff) | |
| download | chromium_src-91b1c63374309247f624d4aaec0f33a2e901bb7f.zip chromium_src-91b1c63374309247f624d4aaec0f33a2e901bb7f.tar.gz chromium_src-91b1c63374309247f624d4aaec0f33a2e901bb7f.tar.bz2 | |
Require multiarch setting in Linux repo config file.
This will force old configs to add this setting on the next update, and
thus get rid of the "missing i386" warning for existing users.
R=phajdan.jr@chromium.org, thestig@chromium.org
BUG=591480
Review URL: https://codereview.chromium.org/1801283002
Cr-Commit-Position: refs/heads/master@{#381287}
(cherry picked from commit 8b58c0d445772371cba4da0000f78917a12c79bc)
Review URL: https://codereview.chromium.org/1800323002 .
Cr-Commit-Position: refs/branch-heads/2623@{#625}
Cr-Branched-From: 92d77538a86529ca35f9220bd3cd512cbea1f086-refs/heads/master@{#369907}
| -rwxr-xr-x | chrome/installer/linux/debian/build.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/installer/linux/debian/build.sh b/chrome/installer/linux/debian/build.sh index 77bf7a9..1bed78e 100755 --- a/chrome/installer/linux/debian/build.sh +++ b/chrome/installer/linux/debian/build.sh @@ -330,7 +330,7 @@ REPOCONFIG="${REPOCONFIG-deb [arch=${ARCHITECTURE}] http://${BASEREPOCONFIG}}" # Allowed configs include optional HTTPS support and explicit multiarch # platforms. REPOCONFIGREGEX="deb (\\\\[arch=[^]]*\\\\b${ARCHITECTURE}\\\\b[^]]*\\\\]" -REPOCONFIGREGEX+="[[:space:]]*)?https?://${BASEREPOCONFIG}" +REPOCONFIGREGEX+="[[:space:]]*) https?://${BASEREPOCONFIG}" stage_install_debian do_package |