merge patch from Daniel Hartwig to Show a error message if {,dist-}upgrade is used...

[apt.git] / methods / copy.cc

diff --git a/methods/copy.cc b/methods/copy.cc
index 8dd0bd3f5037334005f29709d19d50feec618348..e81d0022bd5b5db0133793f901a94c6221de1d8e 100644 (file)
--- a/methods/copy.cc
+++ b/methods/copy.cc
@@ -9,11 +9,13 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include <config.h>
+

 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/fileutl.h>

+#include <apt-pkg/strutl.h>

 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>

-#include <apt-pkg/fileutl.h>

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


@@ -36,7 +38,7 @@ class CopyMethod : public pkgAcqMethod
 bool CopyMethod::Fetch(FetchItem *Itm)
 {
    URI Get = Itm->Uri;
 bool CopyMethod::Fetch(FetchItem *Itm)
 {
    URI Get = Itm->Uri;

-   string File = Get.Path;
+   std::string File = Get.Path;

 
    // Stat the file and send a start message
    struct stat Buf;
 
    // Stat the file and send a start message
    struct stat Buf;


@@ -53,7 +55,7 @@ bool CopyMethod::Fetch(FetchItem *Itm)
    
    // See if the file exists
    FileFd From(File,FileFd::ReadOnly);
    
    // See if the file exists
    FileFd From(File,FileFd::ReadOnly);

-   FileFd To(Itm->DestFile,FileFd::WriteEmpty);
+   FileFd To(Itm->DestFile,FileFd::WriteAtomic);

    To.EraseOnFailure();
    if (_error->PendingError() == true)
    {
    To.EraseOnFailure();
    if (_error->PendingError() == true)
    {


@@ -80,11 +82,12 @@ bool CopyMethod::Fetch(FetchItem *Itm)
       To.OpFail();
       return _error->Errno("utime",_("Failed to set modification time"));
    }
       To.OpFail();
       return _error->Errno("utime",_("Failed to set modification time"));
    }

-
+   

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

-   Hash.AddFD(Fd.Fd(), Fd.Size());
+   Hash.AddFD(Fd);

    Res.TakeHashes(Hash);
    Res.TakeHashes(Hash);

+

    URIDone(Res);
    return true;
 }
    URIDone(Res);
    return true;
 }