diff options
| author | Michael Vogt <mvo@debian.org> | 2014-05-14 18:04:48 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-05-14 18:04:48 +0200 |
| commit | e110d7bf5675f484c06b82f621ac98bedc464865 (patch) | |
| tree | 70ce5da7ad75ccbaf4b30cf4809209993ba98b23 /apt-pkg/acquire-method.h | |
| parent | 0b58b3f8917a49d83154fd3173bca36c1d617ef0 (diff) | |
| parent | 4f6d26b4d41474aa390329b7e9cb167eb70b2821 (diff) | |
Merge remote-tracking branch 'donkult/debian/experimental' into debian/experimental
Conflicts:
apt-pkg/acquire-item.cc
apt-pkg/acquire-item.h
Diffstat (limited to 'apt-pkg/acquire-method.h')
| -rw-r--r-- | apt-pkg/acquire-method.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h index 221ccf273..cbf79f860 100644 --- a/apt-pkg/acquire-method.h +++ b/apt-pkg/acquire-method.h @@ -20,6 +20,7 @@ #ifndef PKGLIB_ACQUIRE_METHOD_H #define PKGLIB_ACQUIRE_METHOD_H +#include <apt-pkg/hashes.h> #include <apt-pkg/macros.h> #include <stdarg.h> @@ -33,7 +34,6 @@ #include <apt-pkg/strutl.h> #endif -class Hashes; class pkgAcqMethod { protected: @@ -47,14 +47,12 @@ class pkgAcqMethod time_t LastModified; bool IndexFile; bool FailIgnore; + HashStringList ExpectedHashes; }; struct FetchResult { - std::string MD5Sum; - std::string SHA1Sum; - std::string SHA256Sum; - std::string SHA512Sum; + HashStringList Hashes; std::vector<std::string> GPGVOutput; time_t LastModified; bool IMSHit; @@ -62,7 +60,7 @@ class pkgAcqMethod unsigned long long Size; unsigned long long ResumePoint; - void TakeHashes(Hashes &Hash); + void TakeHashes(class Hashes &Hash); FetchResult(); }; |