Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(109)

Unified Diff: chrome/installer/linux/common/apt.include

Issue 1769533003: Add multiarch specification to apt repo config. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2623
Patch Set: add fix from c9702882daa3175654319d844fee7d4c64ee468b Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/installer/linux/common/installer.include » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/linux/common/apt.include
diff --git a/chrome/installer/linux/common/apt.include b/chrome/installer/linux/common/apt.include
index 77d418c1a6cf7364c99b2fac251517db8b15c3b6..aabca0905c06441b90db924d5292654bda122b89 100644
--- a/chrome/installer/linux/common/apt.include
+++ b/chrome/installer/linux/common/apt.include
@@ -87,7 +87,7 @@ update_bad_sources() {
ACTIVECONFIGS=$(grep -v "^[[:space:]]*\(#.*\)\?$" "$SOURCELIST" 2>/dev/null)
# Check if the correct repository configuration is in there.
- REPOMATCH=$(grep -E "^[[:space:]#]*\b($REPOCONFIG|$SSLREPOCONFIG)\b" "$SOURCELIST" \
+ REPOMATCH=$(grep -E "^[[:space:]#]*\b$REPOCONFIGREGEX\b" "$SOURCELIST" \
2>/dev/null)
# Check if the correct repository is disabled.
@@ -174,9 +174,9 @@ handle_distro_upgrade() {
find_apt_sources
SOURCELIST="$APT_SOURCESDIR/@@PACKAGE@@.list"
if [ -r "$SOURCELIST" ]; then
- REPOLINE=$(grep -E "^[[:space:]]*#[[:space:]]*($REPOCONFIG|$SSLREPOCONFIG)[[:space:]]*# disabled on upgrade to .*" "$SOURCELIST")
+ REPOLINE=$(grep -E "^[[:space:]]*#[[:space:]]*$REPOCONFIGREGEX[[:space:]]*# disabled on upgrade to .*" "$SOURCELIST")
if [ $? -eq 0 ]; then
- sed -i -e "s,^[[:space:]]*#[[:space:]]*\($REPOCONFIG\|$SSLREPOCONFIG\)[[:space:]]*# disabled on upgrade to .*,\1," \
+ sed -i -e "s,^[[:space:]]*#[[:space:]]*\(.*\)[[:space:]]*# disabled on upgrade to .*,\1," \
"$SOURCELIST"
LOGGER=$(which logger 2> /dev/null)
if [ "$LOGGER" ]; then
« no previous file with comments | « no previous file | chrome/installer/linux/common/installer.include » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698