diff options
| author | Sam Bingner <sam@bingner.com> | 2018-12-26 13:07:23 -1000 |
|---|---|---|
| committer | Sam Bingner <sam@bingner.com> | 2018-12-26 14:51:59 -1000 |
| commit | 59c3e0b998fd69532159d8dc416109cf50651482 (patch) | |
| tree | 2e58bef1273e4d3542c168980e4a2d793e170045 /apt-pkg/aptconfiguration.cc | |
| parent | ac0d26d4e39da16bdbf575637fd3d4b24a7fb4b8 (diff) | |
| parent | 2aa218273eb6009880e987f90d3e24b8efb04642 (diff) | |
Merge nitotv apt fixes into 1.4.81.4.8+nitotv
Diffstat (limited to 'apt-pkg/aptconfiguration.cc')
| -rw-r--r-- | apt-pkg/aptconfiguration.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index e16117b70..a0ba648b4 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -198,7 +198,7 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All, // FIXME: Remove support for the old APT::Acquire::Translation // it was undocumented and so it should be not very widthly used string const oldAcquire = _config->Find("APT::Acquire::Translation",""); - if (oldAcquire.empty() == false && oldAcquire != "environment") { + if (oldAcquire.empty() == false && oldAcquire != "environment" && !_config->Exists("Acquire::Languages")) { // TRANSLATORS: the two %s are APT configuration options _error->Notice("Option '%s' is deprecated. Please use '%s' instead, see 'man 5 apt.conf' for details.", "APT::Acquire::Translation", "Acquire::Languages"); |