* merged with mainline

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

diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index 8dfbf7affe1fd4c3cff84d564c6aa18803f1f6bd..8cf31b3260446d385c44ef35ecfd66da08b6e186 100644 (file)
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -161,6 +161,8 @@ bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool GetAll) const
    for (vector<const debSectionEntry *>::const_iterator I = SectionEntries.begin(); 
        I != SectionEntries.end(); I++) {
 
+      if((*I)->IsSrc)
+        continue;
       debTranslationsIndex i = debTranslationsIndex(URI,Dist,(*I)->Section);
       i.GetIndexes(Owner);
    }
@@ -173,6 +175,10 @@ bool debReleaseIndex::IsTrusted() const
    string VerifiedSigFile = _config->FindDir("Dir::State::lists") +
       URItoFileName(MetaIndexURI("Release")) + ".gpg";
    
+   if(_config->FindB("APT::Authentication::TrustCDROM", false))
+      if(URI.substr(0,strlen("cdrom:")) == "cdrom:")
+        return true;
+   
    if (FileExists(VerifiedSigFile))
       return true;
    return false;