drop empty line from fetch error

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

diff --git a/apt-private/private-source.cc b/apt-private/private-source.cc
index 7126feb7825f91096924706cc27f91ceed1dc8fa..5053c60fc41ba144585978e97cf66d52b46db3f5 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)
 {
-   if (Cache.BuildCaches(false) == false)
-      return nullptr;
    std::string VerTag, UserRequestedVerTag;
    std::string ArchTag = "";
    std::string RelTag = _config->Find("APT::Default-Release");
@@ -321,12 +319,11 @@ bool DoSource(CommandLine &CmdL)
       return _error->Error(_("Must specify at least one package to fetch source for"));
 
    CacheFile Cache;
-   // Read the source list
-   if (Cache.BuildSourceList() == false)
+   if (Cache.BuildCaches(false) == false)
       return false;
-   pkgSourceList *List = Cache.GetSourceList();
 
    // Create the text record parsers
+   pkgSourceList * const List = Cache.GetSourceList();
    pkgSrcRecords SrcRecs(*List);
    if (_error->PendingError() == true)
       return false;
@@ -725,8 +722,11 @@ bool DoBuildDep(CommandLine &CmdL)
               VolatileCmdL.size());
    }
 
+   bool const WantLock = _config->FindB("APT::Get::Print-URIs", false) == false;
    if (CmdL.FileList[1] != 0)
    {
+      if (Cache.BuildCaches(WantLock) == false)
+        return false;
       // Create the text record parsers
       pkgSrcRecords SrcRecs(*List);
       if (_error->PendingError() == true)
@@ -747,7 +747,6 @@ bool DoBuildDep(CommandLine &CmdL)
 
    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());
@@ -776,8 +775,31 @@ bool DoBuildDep(CommandLine &CmdL)
    }
    if (DoAutomaticRemove(Cache) == false)
       return false;
+
    {
       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);
    }