enhance the split out of the gpgv commandline mangling by splitting out

[apt.git] / apt-pkg / deb / debmetaindex.cc

diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index eb01a015663337a3d6958df9cb04ec394005a88a..8df3ed18d4399c1b15567dd80a2c6c01efa0932f 100644 (file)
--- 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;
 }
@@ -310,7 +313,7 @@ class debSLTypeDebian : public pkgSourceList::Type
    {
       map<string, string>::const_iterator const arch = Options.find("arch");
       vector<string> const Archs =
-               (arch != Options.end()) ? ExplodeString(arch->second) :
+               (arch != Options.end()) ? VectorizeString(arch->second, ',') :
                                APT::Configuration::getArchitectures();
 
       for (vector<metaIndex *>::const_iterator I = List.begin();