diff options
| author | Arch Librarian <arch@canonical.com> | 2004-09-20 16:57:20 +0000 |
|---|---|---|
| committer | Arch Librarian <arch@canonical.com> | 2004-09-20 16:57:20 +0000 |
| commit | a7c835af20feeb470238ead3bda36af978c2600f (patch) | |
| tree | fc85aa957eeba8b21c7a9c18bc8efb126c94d222 /apt-pkg/acquire-method.cc | |
| parent | 36803406d195dba90a418bb858ebf65033867aba (diff) | |
Alfredo's vendor stuff
Author: jgg
Date: 2001-03-13 06:51:46 GMT
Alfredo's vendor stuff
Diffstat (limited to 'apt-pkg/acquire-method.cc')
| -rw-r--r-- | apt-pkg/acquire-method.cc | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc index 3b905f4e9..0ecd8df93 100644 --- a/apt-pkg/acquire-method.cc +++ b/apt-pkg/acquire-method.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: acquire-method.cc,v 1.25 2001/02/20 07:03:17 jgg Exp $ +// $Id: acquire-method.cc,v 1.26 2001/03/13 06:51:46 jgg Exp $ /* ###################################################################### Acquire Method @@ -23,7 +23,8 @@ #include <apt-pkg/configuration.h> #include <apt-pkg/strutl.h> #include <apt-pkg/fileutl.h> - +#include <apt-pkg/hashes.h> + #include <stdarg.h> #include <stdio.h> #include <unistd.h> @@ -175,6 +176,8 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt) if (Res.MD5Sum.empty() == false) End += snprintf(End,sizeof(S)-50 - (End - S),"MD5-Hash: %s\n",Res.MD5Sum.c_str()); + if (Res.SHA1Sum.empty() == false) + End += snprintf(End,sizeof(S)-50 - (End - S),"SHA1-Hash: %s\n",Res.SHA1Sum.c_str()); if (Res.ResumePoint != 0) End += snprintf(End,sizeof(S)-50 - (End - S),"Resume-Point: %lu\n", @@ -199,6 +202,9 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt) if (Alt->MD5Sum.empty() == false) End += snprintf(End,sizeof(S)-50 - (End - S),"Alt-MD5-Hash: %s\n", Alt->MD5Sum.c_str()); + if (Alt->SHA1Sum.empty() == false) + End += snprintf(End,sizeof(S)-50 - (End - S),"Alt-SHA1-Hash: %s\n", + Alt->SHA1Sum.c_str()); if (Alt->IMSHit == true) strcat(End,"Alt-IMS-Hit: true\n"); @@ -434,3 +440,13 @@ pkgAcqMethod::FetchResult::FetchResult() : LastModified(0), { } /*}}}*/ +// AcqMethod::FetchResult::TakeHashes - Load hashes /*{{{*/ +// --------------------------------------------------------------------- +/* This hides the number of hashes we are supporting from the caller. + It just deals with the hash class. */ +void pkgAcqMethod::FetchResult::TakeHashes(Hashes &Hash) +{ + MD5Sum = Hash.MD5.Result(); + SHA1Sum = Hash.SHA1.Result(); +} + /*}}}*/ |