allow getaddrinfo flag AI_ADDRCONFIG to be disabled

[apt.git] / methods / copy.cc

diff --git a/methods/copy.cc b/methods/copy.cc
index 4bdc15f754012b933d3323880131e751e887e784..373ad3604b7d8b9cfd29687563ae13866fd73258 100644 (file)
--- a/methods/copy.cc
+++ b/methods/copy.cc
@@ -27,7 +27,7 @@
 
 class CopyMethod : public pkgAcqMethod
 {
-   virtual bool Fetch(FetchItem *Itm);
+   virtual bool Fetch(FetchItem *Itm) APT_OVERRIDE;
    void CalculateHashes(FetchItem const * const Itm, FetchResult &Res);
    
    public:
@@ -38,7 +38,7 @@ class CopyMethod : public pkgAcqMethod
 void CopyMethod::CalculateHashes(FetchItem const * const Itm, FetchResult &Res)
 {
    Hashes Hash(Itm->ExpectedHashes);
-   FileFd Fd(Res.Filename, FileFd::ReadOnly, FileFd::Extension);
+   FileFd Fd(Res.Filename, FileFd::ReadOnly);
    Hash.AddFD(Fd);
    Res.TakeHashes(Hash);
 }
@@ -65,7 +65,7 @@ bool CopyMethod::Fetch(FetchItem *Itm)
    URIStart(Res);
 
    // just calc the hashes if the source and destination are identical
-   if (File == Itm->DestFile)
+   if (File == Itm->DestFile || Itm->DestFile == "/dev/null")
    {
       CalculateHashes(Itm, Res);
       URIDone(Res);