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 4ffe78b24234cad292c8af246d26491eb3330927..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>


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