* apt-pkg/aptconfiguration.cc:

  - respect the none-force even in LANG=C (Closes: #602573)

diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc
index 44f1f318ad049083c8d1f8c494d8fa8bb79fc9e7..5cc9277e4107afd8915b1749fccce84cc9d39163 100644 (file)
--- a/apt-pkg/aptconfiguration.cc
+++ b/apt-pkg/aptconfiguration.cc
@@ -168,7 +168,8 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
 
        // first cornercase: LANG=C, so we use only "en" Translation
        if (envLong == "C") {
-               codes.push_back("en");
+               if (_config->Find("Acquire::Languages","") != "none")
+                       codes.push_back("en");
                allCodes = codes;
                allCodes.insert(allCodes.end(), builtin.begin(), builtin.end());
                if (All == true)

diff --git a/debian/changelog b/debian/changelog
index 6e0ec71375e387af29e53144ce94e55a5afa6b57..ae547bcffcaace70aba421b4b889378b7cda1113 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
 apt (0.8.9) UNRELEASED; urgency=low
 
+  [ Christian Perrier ]
   * Fix "typos" in French manpages translations. Thanks to
     Cyril Brulebois for bashing me.
   * Drop useless untranslatable sections from apt.8
 
- -- Christian Perrier <bubulle@debian.org>  Sat, 30 Oct 2010 09:51:18 +0200
+  [ David Kalnischkies ]
+  * apt-pkg/aptconfiguration.cc:
+    - respect the none-force even in LANG=C (Closes: #602573)
+
+ -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 06 Nov 2010 12:50:20 +0100
 
 apt (0.8.8) unstable; urgency=low
 

diff --git a/test/libapt/getlanguages_test.cc b/test/libapt/getlanguages_test.cc
index 9a8910b586930c0367a59e9a5011a421bd00e064..14f1af185bbca0cbaa2e389625effcdcf9b8e95a 100644 (file)
--- a/test/libapt/getlanguages_test.cc
+++ b/test/libapt/getlanguages_test.cc
@@ -85,6 +85,12 @@ int main(int argc,char *argv[])
        equals(vec.size(), 1);
        equals(vec[0], "en");
 
+       _config->Set("Acquire::Languages", "none");
+       env[0] = "C";
+       vec = APT::Configuration::getLanguages(false, false, env);
+       equals(vec.size(), 0);
+       _config->Set("Acquire::Languages", "");
+
        _config->Set("Acquire::Languages::1", "environment");
        _config->Set("Acquire::Languages::2", "en");
        env[0] = "de_DE.UTF-8";