allow uncompressed files to be empty in store again

[apt.git] / methods / copy.cc

diff --git a/methods/copy.cc b/methods/copy.cc
index f542a27c0b2b34b8ee03e64ef5d2b3c72351dd8c..e515b2def10e1eed04abd89709915703470ec684 100644 (file)
--- a/methods/copy.cc
+++ b/methods/copy.cc
@@ -17,6 +17,7 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/configuration.h>

+#include "aptmethod.h"

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


@@ -25,27 +26,14 @@
 #include <apti18n.h>
                                                                        /*}}}*/
 
 #include <apti18n.h>
                                                                        /*}}}*/
 

-class CopyMethod : public pkgAcqMethod
+class CopyMethod : public aptMethod

 {
 {

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

    public:
    public:

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

 
 

-void CopyMethod::CalculateHashes(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);
-   Hash.AddFD(Fd);
-   Res.TakeHashes(Hash);
-}
+   CopyMethod() : aptMethod("copy", "1.0",SingleInstance | SendConfig) {};
+};

 
 // CopyMethod::Fetch - Fetch a file                                    /*{{{*/
 // ---------------------------------------------------------------------
 
 // CopyMethod::Fetch - Fetch a file                                    /*{{{*/
 // ---------------------------------------------------------------------


@@ -53,7 +41,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,13 +53,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);

-   
+

    // just calc the hashes if the source and destination are identical
    // just calc the hashes if the source and destination are identical

-   if (File == Itm->DestFile)
+   if (File == Itm->DestFile || Itm->DestFile == "/dev/null")

    {
    {

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

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


@@ -80,12 +68,7 @@ bool CopyMethod::Fetch(FetchItem *Itm)
    FileFd From(File,FileFd::ReadOnly);
    FileFd To(Itm->DestFile,FileFd::WriteAtomic);
    To.EraseOnFailure();
    FileFd From(File,FileFd::ReadOnly);
    FileFd To(Itm->DestFile,FileFd::WriteAtomic);
    To.EraseOnFailure();

-   if (_error->PendingError() == true)
-   {
-      To.OpFail();
-      return false;
-   }
-   
+

    // Copy the file
    if (CopyFile(From,To) == false)
    {
    // Copy the file
    if (CopyFile(From,To) == false)
    {


@@ -104,8 +87,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;
 }