Fix the test suite harder

[apt.git] / methods / copy.cc

diff --git a/methods/copy.cc b/methods/copy.cc
index a23c0316c4717568950cacf3aebee238c4fdde30..0c9f322e62aec5d310eb2e9027b78864c3ad5ee6 100644 (file)
--- a/methods/copy.cc
+++ b/methods/copy.cc
@@ -27,22 +27,18 @@
 
 class CopyMethod : public pkgAcqMethod
 {
 
 class CopyMethod : public pkgAcqMethod
 {

-   virtual bool Fetch(FetchItem *Itm);
-   void CalculateHashes(FetchResult &Res);
+   virtual bool Fetch(FetchItem *Itm) APT_OVERRIDE;
+   void CalculateHashes(FetchItem const * const Itm, FetchResult &Res);

    
    public:
    
    CopyMethod() : pkgAcqMethod("1.0",SingleInstance | SendConfig) {};
 };
 
    
    public:
    
    CopyMethod() : pkgAcqMethod("1.0",SingleInstance | SendConfig) {};
 };
 

-void CopyMethod::CalculateHashes(FetchResult &Res)
+void CopyMethod::CalculateHashes(FetchItem const * const Itm, FetchResult &Res)

 {
 {

-   Hashes Hash;
-   FileFd::CompressMode CompressMode = FileFd::None;
-   if (_config->FindB("Acquire::GzipIndexes", false) == true)
-      CompressMode = FileFd::Extension;
-
-   FileFd Fd(Res.Filename, FileFd::ReadOnly, CompressMode);
+   Hashes Hash(Itm->ExpectedHashes);
+   FileFd Fd(Res.Filename, FileFd::ReadOnly, FileFd::Extension);

    Hash.AddFD(Fd);
    Res.TakeHashes(Hash);
 }
    Hash.AddFD(Fd);
    Res.TakeHashes(Hash);
 }


@@ -53,7 +49,7 @@ void CopyMethod::CalculateHashes(FetchResult &Res)
 bool CopyMethod::Fetch(FetchItem *Itm)
 {
    // this ensures that relative paths work in copy
 bool CopyMethod::Fetch(FetchItem *Itm)
 {
    // this ensures that relative paths work in copy

-   std::string File = Itm->Uri.substr(Itm->Uri.find(':')+1);
+   std::string const File = Itm->Uri.substr(Itm->Uri.find(':')+1);

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


@@ -65,21 +61,13 @@ bool CopyMethod::Fetch(FetchItem *Itm)
    Res.Size = Buf.st_size;
    Res.Filename = Itm->DestFile;
    Res.LastModified = Buf.st_mtime;
    Res.Size = Buf.st_size;
    Res.Filename = Itm->DestFile;
    Res.LastModified = Buf.st_mtime;

-   Res.IMSHit = false;      
+   Res.IMSHit = false;

    URIStart(Res);
 
    URIStart(Res);
 

-   // when the files are identical, just compute the hashes
-   if(File == Itm->DestFile)
-   {
-      CalculateHashes(Res);
-      URIDone(Res);
-      return true;
-   }
-   

    // just calc the hashes if the source and destination are identical
    if (File == Itm->DestFile)
    {
    // just calc the hashes if the source and destination are identical
    if (File == Itm->DestFile)
    {

-      CalculateHashes(Res);
+      CalculateHashes(Itm, Res);

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


@@ -112,7 +100,7 @@ bool CopyMethod::Fetch(FetchItem *Itm)
    if (utimes(Res.Filename.c_str(), times) != 0)
       return _error->Errno("utimes",_("Failed to set modification time"));
 
    if (utimes(Res.Filename.c_str(), times) != 0)
       return _error->Errno("utimes",_("Failed to set modification time"));
 

-   CalculateHashes(Res);
+   CalculateHashes(Itm, Res);

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