From b32d92859be55f48b79968e1b42f75238fbab150 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sat, 9 Sep 2017 19:43:08 +0200 Subject: Do not warn about duplicate "legacy" targets If a source has a legacy Contents file, and two lines mention the same archive but different components, a warning would be issued that is confusing. So, as the field is named Contents-deb-legacy, let's just not print warnings for fields containing "legacy". LP: #1697120 Closes: #839259 (cherry picked from commit 5a747462baef6cecf6ed389c7b7492443930f7ed) --- apt-pkg/deb/debmetaindex.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index cba00aa8e..d64bef190 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -277,8 +277,9 @@ static void GetIndexTargetsFor(char const * const Type, std::string const &URI, //TRANSLATOR: an identifier like Packages; Releasefile key indicating // a file like main/binary-amd64/Packages; filename and linenumber of // two sources.list entries - _error->Warning(_("Target %s (%s) is configured multiple times in %s and %s"), - T->c_str(), MetaKey.c_str(), dupEntry.c_str(), E->sourcesEntry.c_str()); + if (T->find("legacy") == std::string::npos) + _error->Warning(_("Target %s (%s) is configured multiple times in %s and %s"), + T->c_str(), MetaKey.c_str(), dupEntry.c_str(), E->sourcesEntry.c_str()); if (tplMetaKey.find(BreakPoint) == std::string::npos) break; continue; -- cgit v1.2.3