Only check for valid Date if checking Valid-Until.

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

diff --git a/apt-private/private-download.cc b/apt-private/private-download.cc
index 4894c72bfe8f3767879f537145488bf2bd69c5ef..d0cbbcf50200bc814ae02d7003e0ded44f71f089 100644 (file)
--- a/apt-private/private-download.cc
+++ b/apt-private/private-download.cc
@@ -25,8 +25,16 @@
 #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/statvfs.h>

+#include <sys/stat.h>

 #include <errno.h>
 
 #include <apti18n.h>
 #include <errno.h>
 
 #include <apti18n.h>


@@ -65,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;


@@ -108,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)


@@ -143,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
            )


@@ -224,6 +231,7 @@ bool DoDownload(CommandLine &CmdL)
         std::ifstream src((*I)->DestFile.c_str(), std::ios::binary);
         std::ofstream dst(filename.c_str(), std::ios::binary);
         dst << src.rdbuf();
         std::ifstream src((*I)->DestFile.c_str(), std::ios::binary);
         std::ofstream dst(filename.c_str(), std::ios::binary);
         dst << src.rdbuf();

+        chmod(filename.c_str(), 0644);

       }
    }
    return Failed == false;
       }
    }
    return Failed == false;


@@ -244,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();


@@ -307,12 +317,18 @@ bool DoClean(CommandLine &)
    }
 
    pkgAcquire Fetcher;
    }
 
    pkgAcquire Fetcher;

-   Fetcher.GetLock(archivedir);
-   Fetcher.Clean(archivedir);
-   Fetcher.Clean(archivedir + "partial/");
+   if (archivedir.empty() == false && FileExists(archivedir) == true &&
+        Fetcher.GetLock(archivedir) == true)
+   {
+      Fetcher.Clean(archivedir);
+      Fetcher.Clean(archivedir + "partial/");
+   }

 
 

-   Fetcher.GetLock(listsdir);
-   Fetcher.Clean(listsdir + "partial/");
+   if (listsdir.empty() == false && FileExists(listsdir) == true &&
+        Fetcher.GetLock(listsdir) == true)
+   {
+      Fetcher.Clean(listsdir + "partial/");
+   }

 
    pkgCacheFile::RemoveCaches();
 
 
    pkgCacheFile::RemoveCaches();
 


@@ -331,16 +347,20 @@ bool DoClean(CommandLine &)
         c1out << "Del " << Pkg << " " << Ver << " [" << SizeToStr(St.st_size) << "B]" << std::endl;
 
         if (_config->FindB("APT::Get::Simulate") == false)
         c1out << "Del " << Pkg << " " << Ver << " [" << SizeToStr(St.st_size) << "B]" << std::endl;
 
         if (_config->FindB("APT::Get::Simulate") == false)

-           unlink(File);
+           RemoveFile("Cleaner::Erase", File);

       };
 };
 bool DoAutoClean(CommandLine &)
 {
       };
 };
 bool DoAutoClean(CommandLine &)
 {

+   std::string const archivedir = _config->FindDir("Dir::Cache::Archives");
+   if (FileExists(archivedir) == false)
+      return true;
+

    // Lock the archive directory
    FileFd Lock;
    if (_config->FindB("Debug::NoLocking",false) == false)
    {
    // Lock the archive directory
    FileFd Lock;
    if (_config->FindB("Debug::NoLocking",false) == false)
    {

-      int lock_fd = GetLock(_config->FindDir("Dir::Cache::Archives") + "lock");
+      int lock_fd = GetLock(flCombine(archivedir, "lock"));

       if (lock_fd < 0)
         return _error->Error(_("Unable to lock the download directory"));
       Lock.Fd(lock_fd);
       if (lock_fd < 0)
         return _error->Error(_("Unable to lock the download directory"));
       Lock.Fd(lock_fd);


@@ -352,7 +372,7 @@ bool DoAutoClean(CommandLine &)
 
    LogCleaner Cleaner;
 
 
    LogCleaner Cleaner;
 

-   return Cleaner.Go(_config->FindDir("Dir::Cache::archives"),*Cache) &&
-      Cleaner.Go(_config->FindDir("Dir::Cache::archives") + "partial/",*Cache);
+   return Cleaner.Go(archivedir, *Cache) &&
+      Cleaner.Go(flCombine(archivedir, "partial/"), *Cache);

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/