diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2022-03-28 15:25:36 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2022-04-01 14:16:15 +0200 |
| commit | 7b8da771e2061462b9196f38366c34e4f919d0df (patch) | |
| tree | 77647d2116023f656e52954a584fdb3b590758c3 /apt-pkg | |
| parent | f6438ea9e726a1c13ce8d90ac78cc272346ab0f8 (diff) | |
Drop support for long obsoleted Suggests alias: Optional
dpkg-dev stopped recognizing it in 2007 (1.14.7) while building packages.
The rename itself happened in 1995 (0.93.72).
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/deb/deblistparser.cc | 5 | ||||
| -rw-r--r-- | apt-pkg/tagfile-keys.list | 1 | ||||
| -rw-r--r-- | apt-pkg/tagfile-order.c | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 2f0ebaa7b..a1247dd98 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -241,10 +241,7 @@ bool debListParser::NewVersion(pkgCache::VerIterator &Ver) return false; if (ParseDepends(Ver,pkgTagSection::Key::Enhances,pkgCache::Dep::Enhances) == false) return false; - // Obsolete. - if (ParseDepends(Ver,pkgTagSection::Key::Optional,pkgCache::Dep::Suggests) == false) - return false; - + if (ParseProvides(Ver) == false) return false; if (not APT::KernelAutoRemoveHelper::getUname(Ver.ParentPkg().Name()).empty()) diff --git a/apt-pkg/tagfile-keys.list b/apt-pkg/tagfile-keys.list index a93052c2f..4b57e46c2 100644 --- a/apt-pkg/tagfile-keys.list +++ b/apt-pkg/tagfile-keys.list @@ -42,7 +42,6 @@ Installed-Size Maintainer MD5sum Multi-Arch -Optional Origin Original-Maintainer Package diff --git a/apt-pkg/tagfile-order.c b/apt-pkg/tagfile-order.c index 510d6dd95..445961abe 100644 --- a/apt-pkg/tagfile-order.c +++ b/apt-pkg/tagfile-order.c @@ -46,7 +46,7 @@ static const char *iTFRewritePackageOrder[] = { "Recommends", "Recommended", // NO_KEY: dpkg nickname for Recommends "Suggests", - "Optional", // dpkg nickname for Suggests + "Optional", // NO_KEY: dpkg nickname for Suggests "Conflicts", "Breaks", "Replaces", |