Only support Translation-* that are listed in the {In,}Release file

[apt.git] / methods / copy.cc

diff --git a/methods/copy.cc b/methods/copy.cc
index 744cc2b51a024b6f421af852d5396d4fd2ad6e37..a23c0316c4717568950cacf3aebee238c4fdde30 100644 (file)
--- a/methods/copy.cc
+++ b/methods/copy.cc
@@ -16,28 +16,44 @@
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>

+#include <apt-pkg/configuration.h>

 
 

+#include <string>

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

-#include <unistd.h>
+#include <sys/time.h>
+

 #include <apti18n.h>
                                                                        /*}}}*/
 
 class CopyMethod : public pkgAcqMethod
 {
    virtual bool Fetch(FetchItem *Itm);
 #include <apti18n.h>
                                                                        /*}}}*/
 
 class CopyMethod : public pkgAcqMethod
 {
    virtual bool Fetch(FetchItem *Itm);

+   void CalculateHashes(FetchResult &Res);

    
    public:
    
    
    public:
    

-   CopyMethod() : pkgAcqMethod("1.0",SingleInstance) {};
+   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::Fetch - Fetch a file                                    /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 bool CopyMethod::Fetch(FetchItem *Itm)
 {
 // CopyMethod::Fetch - Fetch a file                                    /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 bool CopyMethod::Fetch(FetchItem *Itm)
 {

-   URI Get = Itm->Uri;
-   std::string File = Get.Path;
+   // this ensures that relative paths work in copy
+   std::string 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;


@@ -51,7 +67,23 @@ bool CopyMethod::Fetch(FetchItem *Itm)
    Res.LastModified = Buf.st_mtime;
    Res.IMSHit = false;      
    URIStart(Res);
    Res.LastModified = Buf.st_mtime;
    Res.IMSHit = false;      
    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)
+   {
+      CalculateHashes(Res);
+      URIDone(Res);
+      return true;
+   }
+

    // See if the file exists
    FileFd From(File,FileFd::ReadOnly);
    FileFd To(Itm->DestFile,FileFd::WriteAtomic);
    // See if the file exists
    FileFd From(File,FileFd::ReadOnly);
    FileFd To(Itm->DestFile,FileFd::WriteAtomic);


@@ -70,23 +102,17 @@ bool CopyMethod::Fetch(FetchItem *Itm)
    }
 
    From.Close();
    }
 
    From.Close();

+   To.Close();

 
    // Transfer the modification times
 
    // Transfer the modification times

-   struct timespec times[2];
+   struct timeval times[2];

    times[0].tv_sec = Buf.st_atime;
    times[1].tv_sec = Buf.st_mtime;
    times[0].tv_sec = Buf.st_atime;
    times[1].tv_sec = Buf.st_mtime;

-   times[0].tv_nsec = times[1].tv_nsec = 0;
-   if (futimens(To.Fd(), times) != 0)
-   {
-      To.OpFail();
-      return _error->Errno("futimens",_("Failed to set modification time"));
-   }
-   To.Close();
+   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"));

 
 

-   Hashes Hash;
-   FileFd Fd(Res.Filename, FileFd::ReadOnly);
-   Hash.AddFD(Fd);
-   Res.TakeHashes(Hash);
+   CalculateHashes(Res);

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


@@ -98,5 +124,6 @@ int main()
    setlocale(LC_ALL, "");
 
    CopyMethod Mth;
    setlocale(LC_ALL, "");
 
    CopyMethod Mth;

+

    return Mth.Run();
 }
    return Mth.Run();
 }