allow uncompressed files to be empty in store again

[apt.git] / methods / file.cc

diff --git a/methods/file.cc b/methods/file.cc
index 5d5fffa67b289399165b53207a2575b98e263a37..36f3c39b9b8c2a9fef1fc25893e994f43263d0e6 100644 (file)
--- a/methods/file.cc
+++ b/methods/file.cc
@@ -21,6 +21,7 @@
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/strutl.h>

+#include "aptmethod.h"

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


@@ -28,13 +29,12 @@
 #include <apti18n.h>
                                                                        /*}}}*/
 
 #include <apti18n.h>
                                                                        /*}}}*/
 

-class FileMethod : public pkgAcqMethod
+class FileMethod : public aptMethod

 {
 {

-   virtual bool Fetch(FetchItem *Itm);
-   
+   virtual bool Fetch(FetchItem *Itm) APT_OVERRIDE;
+

    public:
    public:

-   
-   FileMethod() : pkgAcqMethod("1.0",SingleInstance | SendConfig | LocalOnly) {};
+   FileMethod() : aptMethod("file", "1.0", SingleInstance | SendConfig | LocalOnly) {};

 };
 
 // FileMethod::Fetch - Fetch a file                                    /*{{{*/
 };
 
 // FileMethod::Fetch - Fetch a file                                    /*{{{*/


@@ -58,13 +58,17 @@ bool FileMethod::Fetch(FetchItem *Itm)
         {
            HashStringList const hsl = Itm->ExpectedHashes;
            if (Itm->ExpectedHashes.VerifyFile(File))
         {
            HashStringList const hsl = Itm->ExpectedHashes;
            if (Itm->ExpectedHashes.VerifyFile(File))

+           {
+              Res.Filename = Itm->DestFile;

               Res.IMSHit = true;
               Res.IMSHit = true;

+           }

         }
       }
    }
    if (Res.IMSHit != true)
         }
       }
    }
    if (Res.IMSHit != true)

-      unlink(Itm->DestFile.c_str());
+      RemoveFile("file", Itm->DestFile);

 
 

+   int olderrno = 0;

    // See if the file exists
    if (stat(File.c_str(),&Buf) == 0)
    {
    // See if the file exists
    if (stat(File.c_str(),&Buf) == 0)
    {


@@ -78,7 +82,13 @@ bool FileMethod::Fetch(FetchItem *Itm)
         if (filesize != 0 && filesize == Res.Size)
            Res.IMSHit = true;
       }
         if (filesize != 0 && filesize == Res.Size)
            Res.IMSHit = true;
       }

+
+      CalculateHashes(Itm, Res);

    }
    }

+   else
+      olderrno = errno;
+   if (Res.IMSHit == false)
+      URIStart(Res);

 
    // See if the uncompressed file exists and reuse it
    FetchResult AltRes;
 
    // See if the uncompressed file exists and reuse it
    FetchResult AltRes;


@@ -88,7 +98,7 @@ bool FileMethod::Fetch(FetchItem *Itm)
    {
       if (APT::String::Endswith(File, *ext) == true)
       {
    {
       if (APT::String::Endswith(File, *ext) == true)
       {

-        std::string const unfile = File.substr(0, File.length() - ext->length() - 1);
+        std::string const unfile = File.substr(0, File.length() - ext->length());

         if (stat(unfile.c_str(),&Buf) == 0)
         {
            AltRes.Size = Buf.st_size;
         if (stat(unfile.c_str(),&Buf) == 0)
         {
            AltRes.Size = Buf.st_size;


@@ -103,20 +113,15 @@ bool FileMethod::Fetch(FetchItem *Itm)
       }
    }
 
       }
    }
 

-   if (Res.Filename.empty() == false)
-   {
-      Hashes Hash(Itm->ExpectedHashes);
-      FileFd Fd(Res.Filename, FileFd::ReadOnly);
-      Hash.AddFD(Fd);
-      Res.TakeHashes(Hash);
-   }
-

    if (AltRes.Filename.empty() == false)
       URIDone(Res,&AltRes);
    else if (Res.Filename.empty() == false)
       URIDone(Res);
    else
    if (AltRes.Filename.empty() == false)
       URIDone(Res,&AltRes);
    else if (Res.Filename.empty() == false)
       URIDone(Res);
    else

-      return _error->Error(_("File not found"));
+   {
+      errno = olderrno;
+      return _error->Errno(File.c_str(), _("File not found"));
+   }

 
    return true;
 }
 
    return true;
 }