Bug#1119710: apt-file does not support architecture variants
Heinrich Schuchardt <[email protected]> Fri, 31 Oct 2025 01:20:39 +0100
| Newsgroups | gmane.linux.debian.apt.devel |
|---|---|
| Message-ID | <176187003930.16873.5627181395896452851.reportbug__23127.3814033315$1761870211$gmane$org@LT03> |
Package: apt-file Version: 3.3 Severity: normal Tags: patch X-Debbugs-Cc: [email protected] User: [email protected] Usertags: origin-ubuntu resolute ubuntu-patch Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * Support architecture variants (LP: #2130385) Thanks for considering the patch. -- System Information: Debian Release: forky/sid APT prefers resolute APT policy: (500, 'resolute') Architecture: amd64 (x86_64) Foreign Architectures: i386, riscv64 Kernel: Linux 6.17.0-6-generic (SMP w/16 CPU threads; PREEMPT) Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_WARN, TAINT_OOT_MODULE Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set Shell: /bin/sh linked to /usr/bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled
apt-file_3.3ubuntu1.debdiff
(text/plain, 999 B)
diff -Nru apt-file-3.3/apt-file apt-file-3.3ubuntu1/apt-file
--- apt-file-3.3/apt-file 2022-09-10 12:29:46.000000000 +0200
+++ apt-file-3.3ubuntu1/apt-file 2025-10-31 00:36:36.000000000 +0100
@@ -707,8 +707,10 @@
debug(1, "Dir::Etc::apt-file-main was not set");
}
get_options();
- @arch_res = split(m/\s*,\s*/,
- $Conf->{arch} || $_config->{'APT::Architecture'});
+ @arch_res = grep { $_ ne '' } split(m/\s*,\s*/,
+ $Conf->{arch} ||
+ ("$_config->{'APT::Architecture'}," .
+ "$_config->{'APT::Architecture-Variants'}"));
@suites = split(m/\s*,\s*/, $_config->get(CONFIG_SEARCH_FILTER_SUITES) // '');
@origins = split(m/\s*,\s*/, $_config->get(CONFIG_SEARCH_FILTER_ORIGINS) // '');
if (none { $_ eq 'all' } @arch_res) {
Binary files /tmp/YFpR_eiorN/apt-file-3.3/apt-file_3.3ubuntu1~ppa1_all.deb and /tmp/5oaof2Z9C3/apt-file-3.3ubuntu1/apt-file_3.3ubuntu1~ppa1_all.deb differ