Browse Source

merged fixes from lp:~mvo/apt/mvo

Michael Vogt 15 years ago
parent
commit
a288748e48
2 changed files with 2 additions and 1 deletions
  1. 1 0
      apt-pkg/acquire-item.cc
  2. 1 1
      apt-pkg/pkgcachegen.cc

+ 1 - 0
apt-pkg/acquire-item.cc

@@ -1397,6 +1397,7 @@ void pkgAcqMetaIndex::QueueIndexes(bool verify)				/*{{{*/
 	    {
 	       std::cerr << "Queueing: " << (*Target)->URI << std::endl;
 	       std::cerr << "Expected Hash: " << ExpectedIndexHash.toStr() << std::endl;
+	       std::cerr << "For: " << Record->MetaKeyFilename << std::endl;
 	    }
 	    if (ExpectedIndexHash.empty() == true && (*Target)->IsOptional() == false)
 	    {

+ 1 - 1
apt-pkg/pkgcachegen.cc

@@ -935,7 +935,7 @@ static bool CheckValidity(const string &CacheFile,
       return false;
    }
 
-   if (List.GetLastModifiedTime() < GetModificationTime(CacheFile))
+   if (List.GetLastModifiedTime() > GetModificationTime(CacheFile))
    {
       if (Debug == true)
 	 std::clog << "sources.list is newer than the cache" << std::endl;