Skip to content

Commit 57ada77

Browse files
committed
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 8b58c0d) Review URL: https://codereview.chromium.org/1804263002 . Cr-Commit-Position: refs/branch-heads/2661@{crosswalk-project#249} Cr-Branched-From: ef6f6ae-refs/heads/master@{#378081}
1 parent 820c22f commit 57ada77

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

chrome/installer/linux/debian/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ REPOCONFIG="${REPOCONFIG-deb [arch=${ARCHITECTURE}] http://${BASEREPOCONFIG}}"
339339
# Allowed configs include optional HTTPS support and explicit multiarch
340340
# platforms.
341341
REPOCONFIGREGEX="deb (\\\\[arch=[^]]*\\\\b${ARCHITECTURE}\\\\b[^]]*\\\\]"
342-
REPOCONFIGREGEX+="[[:space:]]*)?https?://${BASEREPOCONFIG}"
342+
REPOCONFIGREGEX+="[[:space:]]*) https?://${BASEREPOCONFIG}"
343343
stage_install_debian
344344

345345
do_package

0 commit comments

Comments
 (0)