Only check for valid Date if checking Valid-Until.

[apt.git] / apt-private / private-cachefile.h

diff --git a/apt-private/private-cachefile.h b/apt-private/private-cachefile.h
index ed9342db0a1618cc39f388d7d1e782aafc97332c..77e8b61d97371f41d1ceaf2867ea51ea77ff8ae8 100644 (file)
--- a/apt-private/private-cachefile.h
+++ b/apt-private/private-cachefile.h
@@ -9,19 +9,6 @@
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/cacheset.h>
 
-#include <apti18n.h>
-
-// FIXME: we need to find a way to export this
-class APT_PUBLIC SourceList : public pkgSourceList
-{
- public:
-   // Add custom metaIndex (e.g. local files)
-   void AddMetaIndex(metaIndex *mi) {
-      SrcList.push_back(mi);
-   }
-
-};
-
 // class CacheFile - Cover class for some dependency cache functions   /*{{{*/
 class APT_PUBLIC CacheFile : public pkgCacheFile
 {
@@ -36,16 +23,6 @@ class APT_PUBLIC CacheFile : public pkgCacheFile
         return false;
       return true;
    }
-   // FIXME: this can go once the "libapt-pkg" pkgSourceList has a way
-   //        to add custom metaIndexes (or custom local files or so)
-   bool BuildSourceList(OpProgress */*Progress*/ = NULL) {
-      if (SrcList != NULL)
-         return true;
-      SrcList = new SourceList();
-      if (SrcList->ReadMainList() == false)
-         return _error->Error(_("The list of sources could not be read."));
-      return true;
-   }
    bool Open(bool WithLock = true)
    {
       OpTextProgress Prog(*_config);
@@ -67,7 +44,7 @@ class SortedPackageUniverse : public APT::PackageUniverse
    void LazyInit() const;
 
 public:
-   SortedPackageUniverse(CacheFile &Cache);
+   explicit SortedPackageUniverse(CacheFile &Cache);
 
    class const_iterator : public APT::Container_iterator_base<APT::PackageContainerInterface, SortedPackageUniverse, SortedPackageUniverse::const_iterator, std::vector<map_pointer_t>::const_iterator, pkgCache::PkgIterator>
    {