test/integration/test-ubuntu-bug-346386-apt-get-update-paywall: use downloadfile()

[apt.git] / methods / copy.cc

diff --git a/methods/copy.cc b/methods/copy.cc
index 744cc2b51a024b6f421af852d5396d4fd2ad6e37..d59f032ffa741f3aeeb644130a92c63418dec2b9 100644 (file)
--- a/methods/copy.cc
+++ b/methods/copy.cc
@@ -17,8 +17,10 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>
 
 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>
 

+#include <string>

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

-#include <unistd.h>
+#include <sys/time.h>
+

 #include <apti18n.h>
                                                                        /*}}}*/
 
 #include <apti18n.h>
                                                                        /*}}}*/
 


@@ -70,18 +72,15 @@ bool CopyMethod::Fetch(FetchItem *Itm)
    }
 
    From.Close();
    }
 
    From.Close();

+   To.Close();

 
    // Transfer the modification times
 
    // Transfer the modification times

-   struct timespec times[2];
+   struct timeval times[2];

    times[0].tv_sec = Buf.st_atime;
    times[1].tv_sec = Buf.st_mtime;
    times[0].tv_sec = Buf.st_atime;
    times[1].tv_sec = Buf.st_mtime;

-   times[0].tv_nsec = times[1].tv_nsec = 0;
-   if (futimens(To.Fd(), times) != 0)
-   {
-      To.OpFail();
-      return _error->Errno("futimens",_("Failed to set modification time"));
-   }
-   To.Close();
+   times[0].tv_usec = times[1].tv_usec = 0;
+   if (utimes(Res.Filename.c_str(), times) != 0)
+      return _error->Errno("utimes",_("Failed to set modification time"));

 
    Hashes Hash;
    FileFd Fd(Res.Filename, FileFd::ReadOnly);
 
    Hashes Hash;
    FileFd Fd(Res.Filename, FileFd::ReadOnly);