Add GetPriority(VerIterator) to pkgDepCache::Policy

[apt.git] / apt-inst / dirstream.cc

diff --git a/apt-inst/dirstream.cc b/apt-inst/dirstream.cc
index b62bdcae12457e0440ea3910093449218da5a7cc..888020bfb983d671ba67f392f0a4681370ae9892 100644 (file)
--- a/apt-inst/dirstream.cc
+++ b/apt-inst/dirstream.cc
@@ -18,7 +18,7 @@
 
 #include <fcntl.h>
 #include <sys/stat.h>
 
 #include <fcntl.h>
 #include <sys/stat.h>

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

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


@@ -76,7 +76,6 @@ bool pkgDirStream::DoItem(Item &Itm,int &Fd)
         if(mkdir(Itm.Name,Itm.Mode) < 0)
            return false;
         return true;
         if(mkdir(Itm.Name,Itm.Mode) < 0)
            return false;
         return true;

-        break;

       }
       case Item::FIFO:
       break;
       }
       case Item::FIFO:
       break;


@@ -95,11 +94,11 @@ bool pkgDirStream::FinishedFile(Item &Itm,int Fd)
 
    /* Set the modification times. The only way it can fail is if someone
       has futzed with our file, which is intolerable :> */
 
    /* Set the modification times. The only way it can fail is if someone
       has futzed with our file, which is intolerable :> */

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

    times[0].tv_sec = times[1].tv_sec = Itm.MTime;
    times[0].tv_sec = times[1].tv_sec = Itm.MTime;

-   times[0].tv_nsec = times[1].tv_nsec = 0;
-   if (futimens(Fd, times) != 0)
-      _error->Errno("futimens", "Failed to set modification time for %s",Itm.Name);
+   times[0].tv_usec = times[1].tv_usec = 0;
+   if (utimes(Itm.Name, times) != 0)
+      _error->Errno("utimes", "Failed to set modification time for %s",Itm.Name);

 
    if (close(Fd) != 0)
       return _error->Errno("close",_("Failed to close file %s"),Itm.Name);
 
    if (close(Fd) != 0)
       return _error->Errno("close",_("Failed to close file %s"),Itm.Name);


@@ -109,7 +108,7 @@ bool pkgDirStream::FinishedFile(Item &Itm,int Fd)
 // DirStream::Fail - Failed processing a file                          /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // DirStream::Fail - Failed processing a file                          /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool pkgDirStream::Fail(Item &Itm,int Fd)
+bool pkgDirStream::Fail(Item &/*Itm*/, int Fd)

 {
    if (Fd < 0)
       return true;
 {
    if (Fd < 0)
       return true;