diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2014-09-29 22:45:52 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2014-09-30 01:53:47 +0200 |
| commit | f6d4ab9ad8a2cfe52737ab620dd252cf8ceec43d (patch) | |
| tree | 282df83623c80846711fba7df748a69131d5b864 /apt-pkg/acquire-item.h | |
| parent | 3809194b662f48733916e6248cd0c141f281313d (diff) | |
support parsing of all hashes for pdiff
The fileformat of a pdiff index stores currently only SHA1 hashes. With
this change, we look for all other hashes we support as well and take
what we get, so that we can work after the release of jessie to get
right of SHA1 if we want to.
Note that the completely patched file is and was checked against the
hashes collected from the Release file, so this transition isn't mission
critical.
Diffstat (limited to 'apt-pkg/acquire-item.h')
| -rw-r--r-- | apt-pkg/acquire-item.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index 513c516cd..18d72ca40 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -328,11 +328,17 @@ struct DiffInfo { /** The filename of the diff. */ std::string file; - /** The sha1 hash of the diff. */ - std::string sha1; + /** The hashes of the diff */ + HashStringList result_hashes; - /** The size of the diff. */ - unsigned long size; + /** The hashes of the file after the diff is applied */ + HashStringList patch_hashes; + + /** The size of the file after the diff is applied */ + unsigned long long result_size; + + /** The size of the diff itself */ + unsigned long long patch_size; }; /*}}}*/ /** \brief An item that is responsible for fetching a SubIndex {{{ @@ -616,9 +622,6 @@ class pkgAcqIndexDiffs : public pkgAcqBaseIndex */ std::vector<DiffInfo> available_patches; - /** Stop applying patches when reaching that sha1 */ - std::string ServerSha1; - /** The current status of this patch. */ enum DiffState { @@ -662,12 +665,10 @@ class pkgAcqIndexDiffs : public pkgAcqBaseIndex * * \param ShortDesc A brief description of this item. * - * \param ExpectedHashes The expected md5sum of the completely + * \param ExpectedHashes The expected hashsums of the completely * reconstructed package index file; the index file will be tested * against this value when it is entirely reconstructed. * - * \param ServerSha1 is the sha1sum of the current file on the server - * * \param diffs The remaining diffs from the index of diffs. They * should be ordered so that each diff appears before any diff * that depends on it. @@ -676,7 +677,6 @@ class pkgAcqIndexDiffs : public pkgAcqBaseIndex struct IndexTarget const * const Target, HashStringList const &ExpectedHash, indexRecords *MetaIndexParser, - std::string ServerSha1, std::vector<DiffInfo> diffs=std::vector<DiffInfo>()); }; /*}}}*/ |