summaryrefslogtreecommitdiff
path: root/apt-pkg/deb
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2010-02-15 13:05:53 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2010-02-15 13:05:53 +0100
commit1a31359bfe4fdbf9ac1a25ab0b9f013d37099ac4 (patch)
treee727955ba0158915ee6e3ea4ff2938e7d74f3004 /apt-pkg/deb
parentd44b437bd2897bf7fbfbde07a4511c6f7b9ef6a2 (diff)
* aptconfiguration.cc:
- include all existing Translation files in the Cache (Closes: 564137) Previously if APT was executed with a different LC_* all these invocations needed to rebuild the Cache as too many files were included or missing: Now the lists-directory is checked for Translation-files and all these included in getLanguages() regardless of the environment setting (after a "none" so APT will not use them for displaying information).
Diffstat (limited to 'apt-pkg/deb')
-rw-r--r--apt-pkg/deb/debmetaindex.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index eb01a0156..0e4e6df9e 100644
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -214,6 +214,7 @@ bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool const &GetAll) const
s != sections.end(); ++s)
for (set<string>::const_iterator l = s->second.begin();
l != s->second.end(); l++) {
+ if (*l == "none") continue;
debTranslationsIndex i = debTranslationsIndex(URI,Dist,s->first,(*l).c_str());
i.GetIndexes(Owner);
}
@@ -268,8 +269,10 @@ vector <pkgIndexFile *> *debReleaseIndex::GetIndexFiles() {
for (map<string, set<string> >::const_iterator s = sections.begin();
s != sections.end(); ++s)
for (set<string>::const_iterator l = s->second.begin();
- l != s->second.end(); l++)
+ l != s->second.end(); l++) {
+ if (*l == "none") continue;
Indexes->push_back(new debTranslationsIndex(URI,Dist,s->first,(*l).c_str()));
+ }
return Indexes;
}