get pdiff files from the same mirror as the index

[apt.git] / apt-private / private-update.cc

diff --git a/apt-private/private-update.cc b/apt-private/private-update.cc
index 73a82e988f2e468a3ded13e413d03cba44511b46..ba953a088f714136d37556d61fc442d5dcc02868 100644 (file)
--- a/apt-private/private-update.cc
+++ b/apt-private/private-update.cc
@@ -13,6 +13,7 @@
 
 #include <apt-private/acqprogress.h>
 #include <apt-private/private-cachefile.h>
 
 #include <apt-private/acqprogress.h>
 #include <apt-private/private-cachefile.h>

+#include <apt-private/private-download.h>

 #include <apt-private/private-output.h>
 #include <apt-private/private-update.h>
 
 #include <apt-private/private-output.h>
 #include <apt-private/private-update.h>
 


@@ -37,20 +38,15 @@ bool DoUpdate(CommandLine &CmdL)
       return false;
    pkgSourceList *List = Cache.GetSourceList();
 
       return false;
    pkgSourceList *List = Cache.GetSourceList();
 

-   // Create the progress
-   AcqTextStatus Stat(std::cout, ScreenWidth,_config->FindI("quiet",0));
-

    // Just print out the uris an exit if the --print-uris flag was used
    if (_config->FindB("APT::Get::Print-URIs") == true)
    {
       // force a hashsum for compatibility reasons
       _config->CndSet("Acquire::ForceHash", "md5sum");
 
    // Just print out the uris an exit if the --print-uris flag was used
    if (_config->FindB("APT::Get::Print-URIs") == true)
    {
       // force a hashsum for compatibility reasons
       _config->CndSet("Acquire::ForceHash", "md5sum");
 

-      // get a fetcher
-      pkgAcquire Fetcher(&Stat);
-
-      // Populate it with the source selection and get all Indexes 
+      // Populate it with the source selection and get all Indexes

       // (GetAll=true)
       // (GetAll=true)

+      aptAcquireWithTextStatus Fetcher;

       if (List->GetIndexes(&Fetcher,true) == false)
         return false;
 
       if (List->GetIndexes(&Fetcher,true) == false)
         return false;
 


@@ -62,15 +58,18 @@ bool DoUpdate(CommandLine &CmdL)
          if(compExt.empty() == false && 
             APT::String::Endswith(FileName, compExt))
             FileName = FileName.substr(0, FileName.size() - compExt.size() - 1);
          if(compExt.empty() == false && 
             APT::String::Endswith(FileName, compExt))
             FileName = FileName.substr(0, FileName.size() - compExt.size() - 1);

-        c1out << '\'' << I->URI << "' " << FileName << ' ' << 
-            I->Owner->FileSize << ' ' << I->Owner->HashSum() << std::endl;
+        c1out << '\'' << I->URI << "' " << FileName << ' ' <<
+           std::to_string(I->Owner->FileSize) << ' ' << I->Owner->HashSum() << std::endl;

       }
       return true;
    }
 
    // do the work
    if (_config->FindB("APT::Get::Download",true) == true)
       }
       return true;
    }
 
    // do the work
    if (_config->FindB("APT::Get::Download",true) == true)

-       ListUpdate(Stat, *List);
+   {
+      AcqTextStatus Stat(std::cout, ScreenWidth,_config->FindI("quiet",0));
+      ListUpdate(Stat, *List);
+   }

 
    // Rebuild the cache.
    if (_config->FindB("pkgCacheFile::Generate", true) == true)
 
    // Rebuild the cache.
    if (_config->FindB("pkgCacheFile::Generate", true) == true)


@@ -84,7 +83,8 @@ bool DoUpdate(CommandLine &CmdL)
    if (_config->FindB("APT::Cmd::Show-Update-Stats", false) == true)
    {
       int upgradable = 0;
    if (_config->FindB("APT::Cmd::Show-Update-Stats", false) == true)
    {
       int upgradable = 0;

-      Cache.Open();
+      if (Cache.Open() == false)
+         return false;

       for (pkgCache::PkgIterator I = Cache->PkgBegin(); I.end() != true; ++I)
       {
          pkgDepCache::StateCache &state = Cache[I];
       for (pkgCache::PkgIterator I = Cache->PkgBegin(); I.end() != true; ++I)
       {
          pkgDepCache::StateCache &state = Cache[I];