diff options
| author | Julian Andres Klode <jak@debian.org> | 2025-01-01 13:28:47 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2025-01-01 13:28:47 +0000 |
| commit | 813a76d640272fe259ad13ddefa66ca5846ccfec (patch) | |
| tree | 2b340ab94afd5c00a2acf03c2b61d9637d45fab8 /apt-pkg | |
| parent | 6e7c7075f39d6430fb948950322b0801b660c9ea (diff) | |
| parent | bb67ff79e03eec05429fa4d7562813d18080e829 (diff) | |
Merge branch 'pu/obsolete-ftp' into 'main'
Cleanup non-US and ftp references from code and documentation
See merge request apt-team/apt!231
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/cdrom.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/indexcopy.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/versionmatch.h | 2 |
3 files changed, 2 insertions, 4 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) diff --git a/apt-pkg/versionmatch.h b/apt-pkg/versionmatch.h index abaec08d6..283df6128 100644 --- a/apt-pkg/versionmatch.h +++ b/apt-pkg/versionmatch.h @@ -13,7 +13,7 @@ Release: a=testing Release: n=squeeze Release: * - Origin: ftp.debian.org + Origin: deb.debian.org Release may be a complex type that can specify matches for any of: Version (v= with prefix) |