add apt-key support for armored GPG key files (*.asc)

[apt.git] / methods / copy.cc

diff --git a/methods/copy.cc b/methods/copy.cc
index 4bdc15f754012b933d3323880131e751e887e784..810fc2f38356612649fd8d58e14b275639773262 100644 (file)
--- a/methods/copy.cc
+++ b/methods/copy.cc
@@ -13,10 +13,10 @@
 
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/strutl.h>
-#include <apt-pkg/acquire-method.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>
@@ -25,23 +25,14 @@
 #include <apti18n.h>
                                                                        /*}}}*/
 
-class CopyMethod : public pkgAcqMethod
+class CopyMethod : public aptMethod
 {
-   virtual bool Fetch(FetchItem *Itm);
-   void CalculateHashes(FetchItem const * const Itm, FetchResult &Res);
-   
+   virtual bool Fetch(FetchItem *Itm) APT_OVERRIDE;
+
    public:
-   
-   CopyMethod() : pkgAcqMethod("1.0",SingleInstance | SendConfig) {};
-};
 
-void CopyMethod::CalculateHashes(FetchItem const * const Itm, FetchResult &Res)
-{
-   Hashes Hash(Itm->ExpectedHashes);
-   FileFd Fd(Res.Filename, FileFd::ReadOnly, FileFd::Extension);
-   Hash.AddFD(Fd);
-   Res.TakeHashes(Hash);
-}
+   CopyMethod() : aptMethod("copy", "1.0",SingleInstance | SendConfig) {};
+};
 
 // CopyMethod::Fetch - Fetch a file                                    /*{{{*/
 // ---------------------------------------------------------------------
@@ -65,7 +56,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);
@@ -76,12 +67,7 @@ bool CopyMethod::Fetch(FetchItem *Itm)
    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)
    {
@@ -92,16 +78,10 @@ bool CopyMethod::Fetch(FetchItem *Itm)
    From.Close();
    To.Close();
 
-   // Transfer the modification times
-   struct timeval times[2];
-   times[0].tv_sec = Buf.st_atime;
-   times[1].tv_sec = Buf.st_mtime;
-   times[0].tv_usec = times[1].tv_usec = 0;
-   if (utimes(Res.Filename.c_str(), times) != 0)
-      return _error->Errno("utimes",_("Failed to set modification time"));
+   if (TransferModificationTimes(File.c_str(), Res.Filename.c_str(), Res.LastModified) == false)
+      return false;
 
    CalculateHashes(Itm, Res);
-
    URIDone(Res);
    return true;
 }
@@ -109,9 +89,5 @@ bool CopyMethod::Fetch(FetchItem *Itm)
 
 int main()
 {
-   setlocale(LC_ALL, "");
-
-   CopyMethod Mth;
-
-   return Mth.Run();
+   return CopyMethod().Run();
 }