diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2011-10-05 23:00:47 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-10-05 23:00:47 +0200 |
| commit | d073d7db69eddd2d9c22e8ded7c6b871bca1716a (patch) | |
| tree | b8244eb97f78e96e34cf1fc5f1c0b19ec4bd5ab3 /test/libapt/getlanguages_test.cc | |
| parent | 061c58b61ab5aae4689386bd2ab1e36e71470dfc (diff) | |
cherrypick from my apt/experimental branch
* apt-pkg/deb/debmetaindex.cc:
- none is a separator, not a language: no need for Index (Closes: #624218)
* apt-pkg/aptconfiguration.cc:
- do not builtin languages only if none is forced (Closes: #643787)
Diffstat (limited to 'test/libapt/getlanguages_test.cc')
| -rw-r--r-- | test/libapt/getlanguages_test.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/test/libapt/getlanguages_test.cc b/test/libapt/getlanguages_test.cc index f6aa7a697..a1c801ea2 100644 --- a/test/libapt/getlanguages_test.cc +++ b/test/libapt/getlanguages_test.cc @@ -126,13 +126,19 @@ int main(int argc,char *argv[]) _config->Set("Dir::State::lists", argv[1]); vec = APT::Configuration::getLanguages(true, false, env); - equals(vec.size(), 6); + equals(vec.size(), 7); equals(vec[0], "de_DE"); equals(vec[1], "de"); equals(vec[2], "en"); equals(vec[3], "none"); - equalsOr2(vec[4], "pt", "tr"); - equalsOr2(vec[5], "tr", "pt"); + equalsOr3(vec[4], "pt", "tr", "ast_DE"); + equalsOr3(vec[5], "tr", "pt", "ast_DE"); + equalsOr3(vec[6], "tr", "pt", "ast_DE"); + + _config->Set("Acquire::Languages", "none"); + vec = APT::Configuration::getLanguages(true, false, env); + equals(vec.size(), 0); + _config->Set("Acquire::Languages", ""); _config->Set("Dir::State::lists", "/non-existing-dir"); _config->Set("Acquire::Languages::1", "none"); |