add a testcase for support of various build-dependency types

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

diff --git a/apt-private/private-download.cc b/apt-private/private-download.cc
index 5cdcf6038441f4513d5202d763aab6942f0a02c7..d0cbbcf50200bc814ae02d7003e0ded44f71f089 100644 (file)
--- a/apt-private/private-download.cc
+++ b/apt-private/private-download.cc
@@ -25,7 +25,14 @@
 #include <sys/types.h>
 #include <pwd.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <pwd.h>
 #include <fcntl.h>

+#ifdef HAVE_VFS_H

 #include <sys/vfs.h>
 #include <sys/vfs.h>

+#else
+#ifdef HAVE_PARAMS_H
+#include <sys/params.h>
+#endif
+#include <sys/mount.h>
+#endif

 #include <sys/statvfs.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <sys/statvfs.h>
 #include <sys/stat.h>
 #include <errno.h>


@@ -66,8 +73,7 @@ bool AuthPrompt(std::vector<std::string> const &UntrustedList, bool const Prompt
    if (_config->FindI("quiet",0) < 2
        && _config->FindB("APT::Get::Assume-Yes",false) == false)
    {
    if (_config->FindI("quiet",0) < 2
        && _config->FindB("APT::Get::Assume-Yes",false) == false)
    {

-      c2out << _("Install these packages without verification?") << std::flush;
-      if (!YnPrompt(false))
+      if (!YnPrompt(_("Install these packages without verification?"), false))

          return _error->Error(_("Some packages could not be authenticated"));
 
       return true;
          return _error->Error(_("Some packages could not be authenticated"));
 
       return true;


@@ -109,7 +115,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)


@@ -144,7 +150,7 @@ bool CheckFreeSpaceBeforeDownload(std::string const &Dir, unsigned long long Fet
       {
         struct statfs Stat;
         if (statfs(Dir.c_str(),&Stat) != 0
       {
         struct statfs Stat;
         if (statfs(Dir.c_str(),&Stat) != 0

-#if HAVE_STRUCT_STATFS_F_TYPE
+#ifdef HAVE_STRUCT_STATFS_F_TYPE

               || Stat.f_type != RAMFS_MAGIC
 #endif
            )
               || Stat.f_type != RAMFS_MAGIC
 #endif
            )


@@ -246,6 +252,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 +317,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/");
    }