diff options
| author | Julian Andres Klode <jak@debian.org> | 2017-09-09 19:43:08 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2017-09-09 19:47:59 +0200 |
| commit | 5a747462baef6cecf6ed389c7b7492443930f7ed (patch) | |
| tree | 363bbb1d9a69272e2177b1fdb24ab91469b048aa /apt-pkg | |
| parent | 11417c1058e1b8441ee8f30f948e854b7a6ce89e (diff) | |
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
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/deb/debmetaindex.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index a0adf85be..68ff95f48 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -278,8 +278,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; |