diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2022-03-28 15:47:45 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2022-04-01 14:16:19 +0200 |
| commit | 2005f1c263a942b37d179b9b8f9b7ab343ca7459 (patch) | |
| tree | c8112982187dc69b233535a1e22503ce8759a460 | |
| parent | 7b8da771e2061462b9196f38366c34e4f919d0df (diff) | |
Do not order long obsoleted fields anymore
The dependency relation fields old names were deprecated in 1995
as the new ones were introduced. That seems barely long enough now
as a transition period.
| -rw-r--r-- | apt-pkg/tagfile-order.c | 14 | ||||
| -rwxr-xr-x | test/integration/test-apt-tagfile-fields-order | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/apt-pkg/tagfile-order.c b/apt-pkg/tagfile-order.c index 445961abe..7cf188c51 100644 --- a/apt-pkg/tagfile-order.c +++ b/apt-pkg/tagfile-order.c @@ -11,9 +11,9 @@ static const char *iTFRewritePackageOrder[] = { "Architecture", "Subarchitecture", // NO_KEY: Used only by d-i "Version", - "Revision", // NO_KEY: Obsolete (warning in dpkg) - "Package-Revision", // NO_KEY: Obsolete (warning in dpkg) - "Package_Revision", // NO_KEY: Obsolete (warning in dpkg) +// "Revision", // Obsolete (warning in dpkg) +// "Package-Revision", // Obsolete (warning in dpkg) +// "Package_Revision", // Obsolete (warning in dpkg) "Kernel-Version", // NO_KEY: Used only by d-i "Built-Using", "Static-Built-Using", @@ -22,7 +22,7 @@ static const char *iTFRewritePackageOrder[] = { "Multi-Arch", "Status", "Priority", - "Class", // NO_KEY: dpkg nickname for Priority +// "Class", // Obsolete alias for Priority, warning by dpkg "Build-Essential", "Protected", "Important", // old name of Protected @@ -44,9 +44,9 @@ static const char *iTFRewritePackageOrder[] = { "Pre-Depends", "Depends", "Recommends", - "Recommended", // NO_KEY: dpkg nickname for Recommends +// "Recommended", // Obsolete alias for Recommends, warning by dpkg "Suggests", - "Optional", // NO_KEY: dpkg nickname for Suggests +// "Optional", // Obsolete alias for Suggests, warning by dpkg "Conflicts", "Breaks", "Replaces", @@ -73,7 +73,7 @@ static const char *iTFRewriteSourceOrder[] = { "Architecture", "Version", "Priority", - "Class", // NO_KEY: dpkg nickname for Priority +// "Class", // Obsolete alias for Priority, warning by dpkg "Section", "Origin", "Maintainer", diff --git a/test/integration/test-apt-tagfile-fields-order b/test/integration/test-apt-tagfile-fields-order index 54e545c8a..aa817147d 100755 --- a/test/integration/test-apt-tagfile-fields-order +++ b/test/integration/test-apt-tagfile-fields-order @@ -100,7 +100,7 @@ else msgpass msgtest 'Check that apt knows about all fields' 'dpkg parses' sed -n 's#^.*FIELD("\(.*\)").*$#\1#p' "${DPKG_SOURCE_PARSE_C}" | sort -u > dpkg.lst - sed -ne 's#^ "\(.*\)",.*$#\1#p' "${SOURCEDIRECTORY}/apt-pkg/tagfile-order.c" | sed -n '/^Package$/,/^Package$/ p' | head -n -1 | sort > apt.lst + sed -n -e's#^ *// *"# "#' -e 's#^ "\(.*\)",.*$#\1#p' "${SOURCEDIRECTORY}/apt-pkg/tagfile-order.c" | sed -n '/^Package$/,/^Package$/ p' | head -n -1 | sort > apt.lst comparelsts fi |