multicompress with externals sets wrong file modes

[apt.git] / methods / copy.cc

diff --git a/methods/copy.cc b/methods/copy.cc
index e81d0022bd5b5db0133793f901a94c6221de1d8e..744cc2b51a024b6f421af852d5396d4fd2ad6e37 100644 (file)
--- a/methods/copy.cc
+++ b/methods/copy.cc
@@ -18,7 +18,6 @@
 #include <apt-pkg/hashes.h>
 
 #include <sys/stat.h>
 #include <apt-pkg/hashes.h>
 
 #include <sys/stat.h>

-#include <utime.h>

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


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

-   To.Close();
-   
+

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

-   struct utimbuf TimeBuf;
-   TimeBuf.actime = Buf.st_atime;
-   TimeBuf.modtime = Buf.st_mtime;
-   if (utime(Itm->DestFile.c_str(),&TimeBuf) != 0)
+   struct timespec times[2];
+   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();
    {
       To.OpFail();

-      return _error->Errno("utime",_("Failed to set modification time"));
+      return _error->Errno("futimens",_("Failed to set modification time"));

    }
    }

-   
+   To.Close();
+

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