ensure lists/ files have correct permissions after apt-cdrom add

[apt.git] / methods / copy.cc

diff --git a/methods/copy.cc b/methods/copy.cc
index a23c0316c4717568950cacf3aebee238c4fdde30..a8e289df57a71495ecace461ab0e85381f2bdcbd 100644 (file)
--- a/methods/copy.cc
+++ b/methods/copy.cc
@@ -28,16 +28,16 @@
 class CopyMethod : public pkgAcqMethod
 {
    virtual bool Fetch(FetchItem *Itm);
 class CopyMethod : public pkgAcqMethod
 {
    virtual bool Fetch(FetchItem *Itm);

-   void CalculateHashes(FetchResult &Res);
+   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;
+   Hashes Hash(Itm->ExpectedHashes);

    FileFd::CompressMode CompressMode = FileFd::None;
    if (_config->FindB("Acquire::GzipIndexes", false) == true)
       CompressMode = FileFd::Extension;
    FileFd::CompressMode CompressMode = FileFd::None;
    if (_config->FindB("Acquire::GzipIndexes", false) == true)
       CompressMode = FileFd::Extension;


@@ -65,21 +65,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 +104,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;