From 1fa64892e4d54cd52fac731e646cc3d13382fb5a Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sun, 20 Mar 2022 11:15:33 +0100 Subject: Remove non-US leftovers in code and documentation This has long been obsoleted, and there have been previous patches cleaning them up, but some left overs remained. --- apt-pkg/cdrom.cc | 2 -- apt-pkg/indexcopy.cc | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'apt-pkg') diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index 70192a044..84ddae40c 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -223,8 +223,6 @@ int pkgCdrom::Score(string Path) Res += 20; if (Path.find("/non-free-firmware/") != string::npos) Res += 20; - if (Path.find("/non-US/") != string::npos) - Res += 20; if (Path.find("/source/") != string::npos) Res += 10; if (Path.find("/debian/") != string::npos) diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index e635b9042..139b10316 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -335,7 +335,7 @@ bool IndexCopy::ReconstructChop(unsigned long &Chop,string Dir,string File) |------------------- Path It was deciced to use only a single word for dist (rather than say - unstable/non-us) to increase the chance that each CD gets a single + unstable/some-component) to increase the chance that each CD gets a single line in sources.list. */ void IndexCopy::ConvertToSourceList(string CD,string &Path) -- cgit v1.2.3-70-g09d2