diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2005-08-23 08:20:18 +0000 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2005-08-23 08:20:18 +0000 |
| commit | bdcf3b49360a353381e981d1918fc300c559948a (patch) | |
| tree | 09f334d69228757c90c56d0d644a169c300ee8a1 /methods/file.cc | |
| parent | 64995601ae9335dedd180d634940f1426598f7f0 (diff) | |
| parent | 25182152bc7812fdd56fd40f8b9a04a140079585 (diff) | |
* cherry-picked patches from apt--fixes and apt--mvo
Patches applied:
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-14
* added Hashsum support for file and cdrom
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-18
* Change pkgPolicy::Pin from private to protected
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-47
* improve the timeout handling (again)
Diffstat (limited to 'methods/file.cc')
| -rw-r--r-- | methods/file.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/methods/file.cc b/methods/file.cc index 3500de9f5..9cdd5bc2d 100644 --- a/methods/file.cc +++ b/methods/file.cc @@ -15,6 +15,8 @@ // Include Files /*{{{*/ #include <apt-pkg/acquire-method.h> #include <apt-pkg/error.h> +#include <apt-pkg/hashes.h> +#include <apt-pkg/fileutl.h> #include <sys/stat.h> #include <unistd.h> @@ -75,7 +77,11 @@ bool FileMethod::Fetch(FetchItem *Itm) if (Res.Filename.empty() == true) return _error->Error(_("File not found")); - + + Hashes Hash; + FileFd Fd(Res.Filename, FileFd::ReadOnly); + Hash.AddFD(Fd.Fd(), Fd.Size()); + Res.TakeHashes(Hash); URIDone(Res); return true; } |