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

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

Issue 2482343002: Linux installer: Fix APT_SOURCES and APT_SOURCESDIR paths (Closed)
Patch Set: Created 4 years, 1 month 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 | no next file » | 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 cdc0c0ea5bc88f764394368d513cd8afc2edfae5..76c65a8a77018d73099ca87ca6b484f382546642 100644
--- a/chrome/installer/linux/common/apt.include
+++ b/chrome/installer/linux/common/apt.include
@@ -141,10 +141,14 @@ KEYDATA
# Set variables for the locations of the apt sources lists.
find_apt_sources() {
+ # NB: These variables only *sometimes* include a trailing slash. (In
+ # particular, in Ubuntu 16.10 / Debian 9, the default value *stopped*
+ # including the trailing slash.) We have to join them with slashes, even
+ # though that sometimes gives a double slash.
Lei Zhang 2016/11/08 23:44:35 Does "${APTDIR%/}/" make it consistently 1 slash?
APTDIR=$(apt_config_val Dir)
APTETC=$(apt_config_val 'Dir::Etc')
- APT_SOURCES="$APTDIR$APTETC$(apt_config_val 'Dir::Etc::sourcelist')"
- APT_SOURCESDIR="$APTDIR$APTETC$(apt_config_val 'Dir::Etc::sourceparts')"
+ APT_SOURCES="$APTDIR/$APTETC/$(apt_config_val 'Dir::Etc::sourcelist')"
+ APT_SOURCESDIR="$APTDIR/$APTETC/$(apt_config_val 'Dir::Etc::sourceparts')"
}
# Update the Google repository if it's not set correctly.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698