diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2013-08-19 00:00:23 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2014-05-09 13:06:27 +0200 |
| commit | b3501edb7091ca3aa6c2d6d96dc667b8161dd2b9 (patch) | |
| tree | 078d7f11b418e900e21f009275e74b51918c5961 /apt-pkg/acquire-method.h | |
| parent | 1262d35895c930f3fa49d7b4182cdd7a4a841f74 (diff) | |
use HashStringList in the acquire system
It is not very extensible to have the supported Hashes hardcoded
everywhere and especially if it is part of virtual method names.
It is also possible that a method does not support the 'best' hash
(yet), so we might end up not being able to verify a file even though we
have a common subset of supported hashes. And those are just two of the
cases in which it is handy to have a more dynamic selection.
The downside is that this is a MAJOR API break, but the HashStringList
has a string constructor for compatibility, so with a bit of luck the
few frontends playing with the acquire system directly are okay.
Diffstat (limited to 'apt-pkg/acquire-method.h')
| -rw-r--r-- | apt-pkg/acquire-method.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h index 221ccf273..8a17a5fd5 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: @@ -51,10 +51,7 @@ class pkgAcqMethod 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 +59,7 @@ class pkgAcqMethod unsigned long long Size; unsigned long long ResumePoint; - void TakeHashes(Hashes &Hash); + void TakeHashes(class Hashes &Hash); FetchResult(); }; |