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 |