edsp: support generic and solver-specific configs

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

diff --git a/apt-private/private-download.cc b/apt-private/private-download.cc
index 5cdcf6038441f4513d5202d763aab6942f0a02c7..1ae0f4a0eb679f833956cd32b3ae47d4d4553679 100644 (file)
--- a/apt-private/private-download.cc
+++ b/apt-private/private-download.cc
@@ -109,7 +109,7 @@ bool AcquireRun(pkgAcquire &Fetcher, int const PulseInterval, bool * const Failu
       uri.User.clear();
       uri.Password.clear();
       std::string descUri = std::string(uri);
       uri.User.clear();
       uri.Password.clear();
       std::string descUri = std::string(uri);

-      _error->Error(_("Failed to fetch %s  %s\n"), descUri.c_str(),
+      _error->Error(_("Failed to fetch %s  %s"), descUri.c_str(),

            (*I)->ErrorText.c_str());
 
       if (Failure != NULL)
            (*I)->ErrorText.c_str());
 
       if (Failure != NULL)


@@ -246,6 +246,8 @@ bool DoChangelog(CommandLine &CmdL)
 
    bool const downOnly = _config->FindB("APT::Get::Download-Only", false);
    bool const printOnly = _config->FindB("APT::Get::Print-URIs", false);
 
    bool const downOnly = _config->FindB("APT::Get::Download-Only", false);
    bool const printOnly = _config->FindB("APT::Get::Print-URIs", false);

+   if (printOnly)
+      _config->CndSet("Acquire::Changelogs::AlwaysOnline", true);

 
    aptAcquireWithTextStatus Fetcher;
    for (APT::VersionList::const_iterator Ver = verset.begin();
 
    aptAcquireWithTextStatus Fetcher;
    for (APT::VersionList::const_iterator Ver = verset.begin();


@@ -309,16 +311,16 @@ bool DoClean(CommandLine &)
    }
 
    pkgAcquire Fetcher;
    }
 
    pkgAcquire Fetcher;

-   if (archivedir.empty() == false && FileExists(archivedir) == true)
+   if (archivedir.empty() == false && FileExists(archivedir) == true &&
+        Fetcher.GetLock(archivedir) == true)

    {
    {

-      Fetcher.GetLock(archivedir);

       Fetcher.Clean(archivedir);
       Fetcher.Clean(archivedir + "partial/");
    }
 
       Fetcher.Clean(archivedir);
       Fetcher.Clean(archivedir + "partial/");
    }
 

-   if (listsdir.empty() == false && FileExists(listsdir) == true)
+   if (listsdir.empty() == false && FileExists(listsdir) == true &&
+        Fetcher.GetLock(listsdir) == true)

    {
    {

-      Fetcher.GetLock(listsdir);

       Fetcher.Clean(listsdir + "partial/");
    }
 
       Fetcher.Clean(listsdir + "partial/");
    }