Your message dated Sun, 18 Sep 2016 10:37:30 +0000 with message-id <[email protected]> and subject line Bug#825293: fixed in apt-file 3.1 has caused the Debian Bug report #825293, regarding apt: please add support for Contents-udeb-* files to be marked as done.
This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact [email protected] immediately.) -- 825293: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=825293 Debian Bug Tracking System Contact [email protected] with problems
--- Begin Message ---Package: apt Version: 1.3~exp1 Severity: important [ debian-boot@ and apt-file@ people in x-d-cc. ] Hi, apt-file now relies on apt/apt-get indextargets to download/list Contents files, and Contents-udeb-* files are missing at the moment. Tracing this down into apt, it seemed GetIndexTargets needed a few changes to get the proper filenames. AFAICT it's important to have both MetaKey and ShortDesc to match reality, given the 4th parameter passed to the Indextarget sets the URI based on the MetaKey, which is then used to return the filename used in DoIndexTargets (cmdline/apt-get.cc). I'm entirely unsure this is the right place/way to patch those things, but that seems to work for all intents and purposes: (sid-amd64-devel)kibi@wodi:~/hack/apt.git$ apt-file search efivars.ko|grep -- -di: efi-modules-4.5.0-2-amd64-di: /lib/modules/4.5.0-2-amd64/kernel/drivers/firmware/efi/efivars.ko I'm not sure about the following parts, but I suppose d-i is special enough that people having “main/debian-installer” bits in their sources.list shouldn't be too shocked by possible inconsistencies… MetaKey: main/Contents-udeb-amd64 ShortDesc: Contents-udeb-amd64 Description: file:/srv/mirrors/debian sid/main/debian-installer amd64 Contents (deb) <--- Contents (udeb)? URI: file:///srv/mirrors/debian/dists/sid/main/Contents-udeb-amd64 Filename: /var/lib/apt/lists/_srv_mirrors_debian_dists_sid_main_Contents-udeb-amd64.lz4 Optional: yes KeepCompressed: yes Codename: sid Label: Debian Origin: Debian Suite: unstable Trusted: yes Architecture: amd64 Base-URI: file:///srv/mirrors/debian/dists/sid/ By-Hash: yes Component: main/debian-installer CompressionTypes: xz bz2 lzma gz lz4 uncompressed Created-By: Contents-deb <--- Doesn't seem to appear in dak, daklib/contents.py iterates on deb+udeb; apt-specific? DefaultEnabled: yes Fallback-Of: Identifier: Contents-deb <--- Contents-udeb? See above. KeepCompressedAs: lz4 gz xz bz2 lzma uncompressed PDiffs: yes Release: sid Repo-URI: file:///srv/mirrors/debian/ Site: file:/srv/mirrors/debian Sourcesentry: /etc/apt/sources.list:1 Target-Of: deb <--- probably ok, either deb or deb-src AFAICT. Thanks for considering. KiBi.>From 456b5f5c8b1a9a85615054673e70ad74f30da4e9 Mon Sep 17 00:00:00 2001 From: Cyril Brulebois <[email protected]> Date: Wed, 25 May 2016 17:54:58 +0200 Subject: [PATCH] Add support for retrieving and listing Contents-udeb-* files. Since apt-file now relies on apt-get indextargets to figure out which Contents files to look for, it's important for apt to downloads Contents-udeb-* instead of trying to download non-existing debian-installer/Contents-* files. Rewrite MetaKey and ShortDesc accordingly, which enables apt-file to search into udebs. Signed-off-by: Cyril Brulebois <[email protected]> --- apt-pkg/deb/debmetaindex.cc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index f756cdb..4184d00 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -238,6 +238,16 @@ static void GetIndexTargetsFor(char const * const Type, std::string const &URI, ShortDesc = SubstVar(ShortDesc, varname, O->second); LongDesc = SubstVar(LongDesc, varname, O->second); Identifier = SubstVar(Identifier, varname, O->second); + + // Rewrite debian-installer/Contents into Contents-udeb for + // MetaKey and Contents into Contents-udeb for ShortDesc: + std::string di_contents_token = "debian-installer/Contents-"; + std::string contents_token = "Contents-"; + size_t di_pos = MetaKey.find(di_contents_token); + if (di_pos != std::string::npos) { + MetaKey = MetaKey.substr(0, di_pos) + "Contents-udeb-" + MetaKey.substr(di_pos + di_contents_token.length()); + ShortDesc = "Contents-udeb-" + ShortDesc.substr(contents_token.length()); + } } { -- 2.8.1
--- End Message ---
--- Begin Message ---Source: apt-file Source-Version: 3.1 We believe that the bug you reported is fixed in the latest version of apt-file, which is due to be installed in the Debian FTP archive. A summary of the changes between this version and the previous one is attached. Thank you for reporting the bug, which will now be closed. If you have further comments please address them to [email protected], and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Niels Thykier <[email protected]> (supplier of updated apt-file package) (This message was generated automatically at their request; if you believe that there is a problem with it please contact the archive administrators by mailing [email protected]) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Format: 1.8 Date: Sun, 18 Sep 2016 09:59:50 +0000 Source: apt-file Binary: apt-file Architecture: source Version: 3.1 Distribution: unstable Urgency: medium Maintainer: APT Development Team <[email protected]> Changed-By: Niels Thykier <[email protected]> Description: apt-file - search for files within Debian packages (command-line interface) Closes: 820560 821016 825293 825883 832131 Changes: apt-file (3.1) unstable; urgency=medium . * Move apt-file under the APT packaging team. * apt-file: Fix bug in handling patterns starting with "-". Thanks to Paul Wise for reporting the issue. (Closes: #821016) * apt-file: Fix bug where package listing did not work if the Contents files did not include sections. Thanks to "Unit 193" for the report. (Closes: #820560) * apt-file-2-update.sh: Correct path to the "partial" directory. Thanks to Ritesh Raj Sarraf for the report. (Closes: #832131) * apt-file, 50apt-file.conf: Support fetching of Contents files in legacy locations (as used by Ubuntu) by default. This requires apt 1.3. * apt-file: Support setting a default value for -I/--index-names in the apt config file. Thanks to Cyril Brulebois for the suggestion (part of #825293) * apt-file: Accept "ALL" as a special index name for -I. When given, apt-file will search all of its indices. Thanks to Cyril Brulebois for the suggestion (part of #825293). * debian/NEWS: Clarify that the indices for source packages and udebs are disabled in the apt-file 2 -> 3 transition. These must be manually reabled. Thanks to Cyril Brulebois for the report. (Closes: #825293) * apt-file: Exit with an error if a subprocess exits non-zero (except for grep) or is killed by a signal. Thanks to Paul Wise for the suggestion. (Closes: #825883) * Set debhelper compat to "beta-tester" and bump the minimum requirements for debhelper to 10. * Bump Standards-Versions to 3.9.8 - no changes required. Checksums-Sha1: 798450f4eb765d8bda5c815d47d318e52745abee 1730 apt-file_3.1.dsc 691649837bef2f9d6b1d590a5434da29f58d510e 42032 apt-file_3.1.tar.xz Checksums-Sha256: 2ddacc683200a4cbfcde224094fa1e8c5a80763587a16919503607cf78c38aaf 1730 apt-file_3.1.dsc 0784cc7be70b2742d02af0d3c193e76c649e6842865fbd94209a79ce06cd0574 42032 apt-file_3.1.tar.xz Files: 2d17f7b65a1bce3a595554de9855add6 1730 admin optional apt-file_3.1.dsc 4bb93d00cbd53ca96117262dc6ece996 42032 admin optional apt-file_3.1.tar.xz -----BEGIN PGP SIGNATURE----- iQIcBAEBCAAGBQJX3mYkAAoJEAVLu599gGRCnHoP/0XI20uCNI0sZ+lpIsvmxwzK 90EI5Z3P2b0XgKLaQpfD4jXgX6p30j3KklJXApIC8safRDyLN64uYgYQj65Ichfw ZLKwUE9E9hPiN7O+YYczR2rloT4n14yh6nUzBTpRf56pyRX4yCwhnnLBwXGmYY9L Pva3fOwhP+01LoGW2eu4OZWL9He6oysk6naOTmZfhQl1Yi9lpOxymp60Gp3xipBY BhYl/nbrjYaQbrSirt4XDgaIOATTPyuKENCRrASKXqsut3eRAJblZyOJcST4IYTi Vsc6pgVO2H4z4NKcBQfTogI+hPT8NaQ/0XquHeEEocnsyoiVwgplffKcblC/b1CL ScKHnAJOlckcmbgCW1wBX69ytwJDoO1eOt4zQlvsn2jcIFGVdgrL95ppujmENngo qXej6xNvWPHuwfW5mu83qAg5rjwhdoJDbFevVALMBzdcb4skTSEwEJFtOp9jvE6m QRobaPmnjMvOhy4O1tM/or0yTdl6bXdkCyq1SEiPwqWOhqGHfmpq2IztnoEL9uY3 g20AUqS11dNp3EMaDAnHhRq5a4e8ALpbvTKRkal6sB4CKn3rWtCkClxuJb00tIHG g9f88MzXRdyGU8j43JG60qnR7KDFA7HECyLOKj333RlYP3m1kFFznnoUnPcsWLjI Tq2Zrojjyp3Dgh3/kb6W =CjiW -----END PGP SIGNATURE-----
--- End Message ---
