improve arch-unqualified dpkg-progress parsing

[apt.git] / methods / store.cc

diff --git a/methods/store.cc b/methods/store.cc
index 2ad0f0177675a6ac50e4ee8a7d2dbecdbfac3a86..1faaa4fb4764c52a3633cec6ab671114480a5613 100644 (file)
--- a/methods/store.cc
+++ b/methods/store.cc
@@ -14,7 +14,6 @@
 #include <config.h>
 
 #include <apt-pkg/configuration.h>
 #include <config.h>
 
 #include <apt-pkg/configuration.h>

-#include <apt-pkg/acquire-method.h>

 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/hashes.h>


@@ -33,12 +32,15 @@
 
 class StoreMethod : public aptMethod
 {
 
 class StoreMethod : public aptMethod
 {

-   std::string const Prog;

    virtual bool Fetch(FetchItem *Itm) APT_OVERRIDE;
 
    public:
 
    virtual bool Fetch(FetchItem *Itm) APT_OVERRIDE;
 
    public:
 

-   explicit StoreMethod(std::string const &pProg) : aptMethod(pProg.c_str(),"1.2",SingleInstance | SendConfig), Prog(pProg) {};
+   explicit StoreMethod(std::string &&pProg) : aptMethod(std::move(pProg),"1.2",SingleInstance | SendConfig)
+   {
+      if (Binary != "store")
+        methodNames.insert(methodNames.begin(), "store");
+   }

 };
 
 static bool OpenFileWithCompressorByName(FileFd &fileFd, std::string const &Filename, unsigned int const Mode, std::string const &Name)
 };
 
 static bool OpenFileWithCompressorByName(FileFd &fileFd, std::string const &Filename, unsigned int const Mode, std::string const &Name)


@@ -71,7 +73,7 @@ bool StoreMethod::Fetch(FetchItem *Itm)                                       /*{{{*/
    FileFd From;
    if (_config->FindB("Method::Compress", false) == false)
    {
    FileFd From;
    if (_config->FindB("Method::Compress", false) == false)
    {

-      if (OpenFileWithCompressorByName(From, Path, FileFd::ReadOnly, Prog) == false)
+      if (OpenFileWithCompressorByName(From, Path, FileFd::ReadOnly, Binary) == false)

         return false;
       if(From.IsCompressed() && From.FileSize() == 0)
         return _error->Error(_("Empty files can't be valid archives"));
         return false;
       if(From.IsCompressed() && From.FileSize() == 0)
         return _error->Error(_("Empty files can't be valid archives"));


@@ -86,7 +88,7 @@ bool StoreMethod::Fetch(FetchItem *Itm)                                       /*{{{*/
    {
       if (_config->FindB("Method::Compress", false) == false)
         To.Open(Itm->DestFile, FileFd::WriteOnly | FileFd::Create | FileFd::Atomic, FileFd::Extension);
    {
       if (_config->FindB("Method::Compress", false) == false)
         To.Open(Itm->DestFile, FileFd::WriteOnly | FileFd::Create | FileFd::Atomic, FileFd::Extension);

-      else if (OpenFileWithCompressorByName(To, Itm->DestFile, FileFd::WriteOnly | FileFd::Create | FileFd::Empty, Prog) == false)
+      else if (OpenFileWithCompressorByName(To, Itm->DestFile, FileFd::WriteOnly | FileFd::Create | FileFd::Empty, Binary) == false)

            return false;
 
       if (To.IsOpen() == false || To.Failed() == true)
            return false;
 
       if (To.IsOpen() == false || To.Failed() == true)


@@ -127,20 +129,8 @@ bool StoreMethod::Fetch(FetchItem *Itm)                                    /*{{{*/
    if (Failed == true)
       return false;
 
    if (Failed == true)
       return false;
 

-   // Transfer the modification times
-   if (Itm->DestFile != "/dev/null")
-   {
-      struct stat Buf;
-      if (stat(Path.c_str(),&Buf) != 0)
-        return _error->Errno("stat",_("Failed to stat"));
-
-      struct timeval times[2];
-      times[0].tv_sec = Buf.st_atime;
-      Res.LastModified = times[1].tv_sec = Buf.st_mtime;
-      times[0].tv_usec = times[1].tv_usec = 0;
-      if (utimes(Itm->DestFile.c_str(), times) != 0)
-        return _error->Errno("utimes",_("Failed to set modification time"));
-   }
+   if (TransferModificationTimes(Path.c_str(), Itm->DestFile.c_str(), Res.LastModified) == false)
+      return false;

 
    // Return a Done response
    Res.TakeHashes(Hash);
 
    // Return a Done response
    Res.TakeHashes(Hash);


@@ -152,8 +142,5 @@ bool StoreMethod::Fetch(FetchItem *Itm)                                     /*{{{*/
 
 int main(int, char *argv[])
 {
 
 int main(int, char *argv[])
 {

-   setlocale(LC_ALL, "");
-
-   StoreMethod Mth(flNotDir(argv[0]));
-   return Mth.Run();
+   return StoreMethod(flNotDir(argv[0])).Run();

 }
 }