summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2022-03-20 11:15:33 +0100
committerGuillem Jover <guillem@debian.org>2024-12-28 13:20:50 +0100
commit1fa64892e4d54cd52fac731e646cc3d13382fb5a (patch)
treed5748af343cb6c297dd2e23a4400ce8665930480 /apt-pkg
parent073c266ced5ea4057d0da8c86e6f1b72fcaf4f1f (diff)
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.
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/cdrom.cc2
-rw-r--r--apt-pkg/indexcopy.cc2
2 files changed, 1 insertions, 3 deletions
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)