Skip to content

Commit

Permalink
Require multiarch setting in Linux repo config file.
Browse files Browse the repository at this point in the history
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.

[email protected], [email protected]
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}
  • Loading branch information
mmossg committed Mar 15, 2016
1 parent 820c22f commit 57ada77
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion chrome/installer/linux/debian/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,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

0 comments on commit 57ada77

Please sign in to comment.