get pdiff files from the same mirror as the index

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

diff --git a/apt-private/private-source.cc b/apt-private/private-source.cc
index c45af6651f1dbe9ae0fad00589e77c403506eb62..1e819a6683c86bca3b1c1e0a4651534442f053c2 100644 (file)
--- a/apt-private/private-source.cc
+++ b/apt-private/private-source.cc
@@ -73,8 +73,6 @@ static pkgSrcRecords::Parser *FindSrc(const char *Name,
                               pkgSrcRecords &SrcRecs,std::string &Src,
                               CacheFile &Cache)
 {
                               pkgSrcRecords &SrcRecs,std::string &Src,
                               CacheFile &Cache)
 {

-   if (Cache.BuildCaches(false) == false)
-      return nullptr;

    std::string VerTag, UserRequestedVerTag;
    std::string ArchTag = "";
    std::string RelTag = _config->Find("APT::Default-Release");
    std::string VerTag, UserRequestedVerTag;
    std::string ArchTag = "";
    std::string RelTag = _config->Find("APT::Default-Release");


@@ -152,12 +150,12 @@ static pkgSrcRecords::Parser *FindSrc(const char *Name,
            // pick highest version for the arch unless the user wants
            // something else
            if (ArchTag != "" && VerTag == "" && RelTag == "")
            // pick highest version for the arch unless the user wants
            // something else
            if (ArchTag != "" && VerTag == "" && RelTag == "")

-              if(Cache->VS().CmpVersion(VerTag, Ver.VerStr()) < 0)
+              if(Cache.GetPkgCache()->VS->CmpVersion(VerTag, Ver.VerStr()) < 0)

                  VerTag = Ver.VerStr();
 
            // We match against a concrete version (or a part of this version)
            if (VerTag.empty() == false &&
                  VerTag = Ver.VerStr();
 
            // We match against a concrete version (or a part of this version)
            if (VerTag.empty() == false &&

-                 (fuzzy == true || Cache->VS().CmpVersion(VerTag, Ver.VerStr()) != 0) && // exact match
+                 (fuzzy == true || Cache.GetPkgCache()->VS->CmpVersion(VerTag, Ver.VerStr()) != 0) && // exact match

                  (fuzzy == false || strncmp(VerTag.c_str(), Ver.VerStr(), VerTag.size()) != 0)) // fuzzy match
               continue;
 
                  (fuzzy == false || strncmp(VerTag.c_str(), Ver.VerStr(), VerTag.size()) != 0)) // fuzzy match
               continue;
 


@@ -275,11 +273,11 @@ static pkgSrcRecords::Parser *FindSrc(const char *Name,
 
                     // Ignore all versions which doesn't fit
                     if (VerTag.empty() == false &&
 
                     // Ignore all versions which doesn't fit
                     if (VerTag.empty() == false &&

-                          Cache->VS().CmpVersion(VerTag, Ver) != 0) // exact match
+                          Cache.GetPkgCache()->VS->CmpVersion(VerTag, Ver) != 0) // exact match

                        continue;
 
                     // Newer version or an exact match? Save the hit
                        continue;
 
                     // Newer version or an exact match? Save the hit

-                    if (Last == 0 || Cache->VS().CmpVersion(Version,Ver) < 0) {
+                    if (Last == 0 || Cache.GetPkgCache()->VS->CmpVersion(Version,Ver) < 0) {

                        Last = Parse;
                        Offset = Parse->Offset();
                        Version = Ver;
                        Last = Parse;
                        Offset = Parse->Offset();
                        Version = Ver;


@@ -317,19 +315,15 @@ struct DscFile
 };
 bool DoSource(CommandLine &CmdL)
 {
 };
 bool DoSource(CommandLine &CmdL)
 {

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

    if (CmdL.FileSize() <= 1)
       return _error->Error(_("Must specify at least one package to fetch source for"));
 
    if (CmdL.FileSize() <= 1)
       return _error->Error(_("Must specify at least one package to fetch source for"));
 

-   // Read the source list
-   if (Cache.BuildSourceList() == false)
+   CacheFile Cache;
+   if (Cache.BuildCaches(false) == false)

       return false;
       return false;

-   pkgSourceList *List = Cache.GetSourceList();

 
    // Create the text record parsers
 
    // Create the text record parsers

+   pkgSourceList * const List = Cache.GetSourceList();

    pkgSrcRecords SrcRecs(*List);
    if (_error->PendingError() == true)
       return false;
    pkgSrcRecords SrcRecs(*List);
    if (_error->PendingError() == true)
       return false;


@@ -444,6 +438,7 @@ bool DoSource(CommandLine &CmdL)
         {
            ioprintf(c1out, "Skipping download of file '%s' as requested hashsum is not available for authentication\n",
                  localFile.c_str());
         {
            ioprintf(c1out, "Skipping download of file '%s' as requested hashsum is not available for authentication\n",
                  localFile.c_str());

+           Dsc[J].Dsc.clear();

            continue;
         }
 
            continue;
         }
 


@@ -484,8 +479,8 @@ bool DoSource(CommandLine &CmdL)
    {
       pkgAcquire::UriIterator I = Fetcher.UriBegin();
       for (; I != Fetcher.UriEnd(); ++I)
    {
       pkgAcquire::UriIterator I = Fetcher.UriBegin();
       for (; I != Fetcher.UriEnd(); ++I)

-        std::cout << '\'' << I->URI << "' " << flNotDir(I->Owner->DestFile) << ' ' << 
-           I->Owner->FileSize << ' ' << I->Owner->HashSum() << std::endl;
+        std::cout << '\'' << I->URI << "' " << flNotDir(I->Owner->DestFile) << ' ' <<
+           std::to_string(I->Owner->FileSize) << ' ' << I->Owner->HashSum() << std::endl;

       return true;
    }
 
       return true;
    }
 


@@ -514,7 +509,7 @@ bool DoSource(CommandLine &CmdL)
       bool const fixBroken = _config->FindB("APT::Get::Fix-Broken", false);
       for (unsigned I = 0; I != J; ++I)
       {
       bool const fixBroken = _config->FindB("APT::Get::Fix-Broken", false);
       for (unsigned I = 0; I != J; ++I)
       {

-        std::string Dir = Dsc[I].Package + '-' + Cache->VS().UpstreamVersion(Dsc[I].Version.c_str());
+        std::string Dir = Dsc[I].Package + '-' + Cache.GetPkgCache()->VS->UpstreamVersion(Dsc[I].Version.c_str());

 
         // Diff only mode only fetches .diff files
         if (_config->FindB("APT::Get::Diff-Only",false) == true ||
 
         // Diff only mode only fetches .diff files
         if (_config->FindB("APT::Get::Diff-Only",false) == true ||


@@ -625,7 +620,9 @@ static void WriteBuildDependencyPackage(std::ostringstream &buildDepsPkgFile,
    for (auto const &dep: Dependencies)
    {
       std::string * type;
    for (auto const &dep: Dependencies)
    {
       std::string * type;

-      if (dep.Type == pkgSrcRecords::Parser::BuildConflict || dep.Type == pkgSrcRecords::Parser::BuildConflictIndep)
+      if (dep.Type == pkgSrcRecords::Parser::BuildConflict ||
+                 dep.Type == pkgSrcRecords::Parser::BuildConflictIndep ||
+                 dep.Type == pkgSrcRecords::Parser::BuildConflictArch)

         type = &conflicts;
       else
         type = &depends;
         type = &conflicts;
       else
         type = &depends;


@@ -649,7 +646,7 @@ static void WriteBuildDependencyPackage(std::ostringstream &buildDepsPkgFile,
 bool DoBuildDep(CommandLine &CmdL)
 {
    CacheFile Cache;
 bool DoBuildDep(CommandLine &CmdL)
 {
    CacheFile Cache;

-   std::vector<char const *> VolatileCmdL;
+   std::vector<std::string> VolatileCmdL;

    Cache.GetSourceList()->AddVolatileFiles(CmdL, &VolatileCmdL);
 
    _config->Set("APT::Install-Recommends", false);
    Cache.GetSourceList()->AddVolatileFiles(CmdL, &VolatileCmdL);
 
    _config->Set("APT::Install-Recommends", false);


@@ -707,18 +704,18 @@ bool DoBuildDep(CommandLine &CmdL)
       {
         for (size_t i = 0; i < VolatileSources.size(); ++i)
         {
       {
         for (size_t i = 0; i < VolatileSources.size(); ++i)
         {

-           char const * const Src = VolatileCmdL[i];
+           auto const Src = VolatileCmdL[i];

            if (DirectoryExists(Src))
            if (DirectoryExists(Src))

-              ioprintf(c1out, _("Note, using directory '%s' to get the build dependencies\n"), Src);
+              ioprintf(c1out, _("Note, using directory '%s' to get the build dependencies\n"), Src.c_str());

            else
            else

-              ioprintf(c1out, _("Note, using file '%s' to get the build dependencies\n"), Src);
+              ioprintf(c1out, _("Note, using file '%s' to get the build dependencies\n"), Src.c_str());

            std::unique_ptr<pkgSrcRecords::Parser> Last(VolatileSources[i]->CreateSrcParser());
            if (Last == nullptr)
            std::unique_ptr<pkgSrcRecords::Parser> Last(VolatileSources[i]->CreateSrcParser());
            if (Last == nullptr)

-              return _error->Error(_("Unable to find a source package for %s"), Src);
+              return _error->Error(_("Unable to find a source package for %s"), Src.c_str());

 
            std::string const pseudo = std::string("builddeps:") + Src;
            WriteBuildDependencyPackage(buildDepsPkgFile, pseudo, pseudoArch,
 
            std::string const pseudo = std::string("builddeps:") + Src;
            WriteBuildDependencyPackage(buildDepsPkgFile, pseudo, pseudoArch,

-                 GetBuildDeps(Last.get(), Src, StripMultiArch, hostArch));
+                 GetBuildDeps(Last.get(), Src.c_str(), StripMultiArch, hostArch));

            pseudoPkgs.emplace_back(pseudo, pseudoArch);
         }
       }
            pseudoPkgs.emplace_back(pseudo, pseudoArch);
         }
       }


@@ -728,8 +725,11 @@ bool DoBuildDep(CommandLine &CmdL)
               VolatileCmdL.size());
    }
 
               VolatileCmdL.size());
    }
 

+   bool const WantLock = _config->FindB("APT::Get::Print-URIs", false) == false;

    if (CmdL.FileList[1] != 0)
    {
    if (CmdL.FileList[1] != 0)
    {

+      if (Cache.BuildCaches(WantLock) == false)
+        return false;

       // Create the text record parsers
       pkgSrcRecords SrcRecs(*List);
       if (_error->PendingError() == true)
       // Create the text record parsers
       pkgSrcRecords SrcRecs(*List);
       if (_error->PendingError() == true)


@@ -750,7 +750,6 @@ bool DoBuildDep(CommandLine &CmdL)
 
    Cache.AddIndexFile(new debStringPackageIndex(buildDepsPkgFile.str()));
 
 
    Cache.AddIndexFile(new debStringPackageIndex(buildDepsPkgFile.str()));
 

-   bool WantLock = _config->FindB("APT::Get::Print-URIs", false) == false;

    if (Cache.Open(WantLock) == false)
       return false;
    pkgProblemResolver Fix(Cache.GetDepCache());
    if (Cache.Open(WantLock) == false)
       return false;
    pkgProblemResolver Fix(Cache.GetDepCache());


@@ -779,8 +778,31 @@ bool DoBuildDep(CommandLine &CmdL)
    }
    if (DoAutomaticRemove(Cache) == false)
       return false;
    }
    if (DoAutomaticRemove(Cache) == false)
       return false;

+

    {
       pkgDepCache::ActionGroup group(Cache);
    {
       pkgDepCache::ActionGroup group(Cache);

+      if (_config->FindB("APT::Get::Build-Dep-Automatic", false) == false)
+      {
+        for (auto const &pkg: removeAgain)
+        {
+           auto const instVer = Cache[pkg].InstVerIter(Cache);
+           if (unlikely(instVer.end() == true))
+              continue;
+           for (auto D = instVer.DependsList(); D.end() != true; ++D)
+           {
+              if (D->Type != pkgCache::Dep::Depends || D.IsMultiArchImplicit())
+                 continue;
+              APT::VersionList verlist = APT::VersionList::FromDependency(Cache, D, APT::CacheSetHelper::CANDIDATE);
+              for (auto const &V : verlist)
+              {
+                 auto const P = V.ParentPkg();
+                 if (Cache[P].InstallVer != V)
+                    continue;
+                 Cache->MarkAuto(P, false);
+              }
+           }
+        }
+      }

       for (auto const &pkg: removeAgain)
         Cache->MarkDelete(pkg, false, 0, true);
    }
       for (auto const &pkg: removeAgain)
         Cache->MarkDelete(pkg, false, 0, true);
    }