* Add hash support to copy method. Thanks Anders Kaseorg by the patch

  (closes: #436055)

diff --git a/debian/changelog b/debian/changelog
index 3e17696a8b00229ed2f4b27fd83c811be0421e61..aadf8601c7c9c1c755f92bd7a8b5ba4b0ef01312 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 apt (0.7.7) UNRELEASED; urgency=low
 
 apt (0.7.7) UNRELEASED; urgency=low
 

+  [ Michael Vogt ]

   * apt-inst/contrib/extracttar.cc:
     - fix fd leak for zero size files (thanks to Bill Broadley for
       reporting this bug)
   * apt-inst/contrib/extracttar.cc:
     - fix fd leak for zero size files (thanks to Bill Broadley for
       reporting this bug)


@@ -20,7 +21,11 @@ apt (0.7.7) UNRELEASED; urgency=low
   [ Program translations ]
     - French updated
 
   [ Program translations ]
     - French updated
 

- -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 02 Aug 2007 11:55:54 +0200
+  [ Otavio Salvador ]
+  * Add hash support to copy method. Thanks Anders Kaseorg by the patch
+    (closes: #436055)
+
+ -- Otavio Salvador <otavio@debian.org>  Mon, 06 Aug 2007 10:44:53 -0300

 
 apt (0.7.6) unstable; urgency=low
 
 
 apt (0.7.6) unstable; urgency=low
 

diff --git a/methods/copy.cc b/methods/copy.cc
index d737e3c33cb851b646d726c24f00fad053098cce..72896b4c076e77ce56086c6a3519770571d599c4 100644 (file)
--- a/methods/copy.cc
+++ b/methods/copy.cc
@@ -12,6 +12,7 @@
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>

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

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


@@ -79,6 +80,10 @@ bool CopyMethod::Fetch(FetchItem *Itm)
       return _error->Errno("utime",_("Failed to set modification time"));
    }
    
       return _error->Errno("utime",_("Failed to set modification time"));
    }
    

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

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