Fixed md5 handling

Author: jgg
Date: 1999-01-24 21:16:04 GMT
Fixed md5 handling

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 59301784e04b3ce79f0a56a1c1926bef8a0b42c8..aef96687e6eb75d2ffa6304f63eacaff9acd518d 100644 (file)
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: acquire-item.cc,v 1.17 1998/12/11 06:32:33 jgg Exp $
+// $Id: acquire-item.cc,v 1.18 1999/01/24 21:16:04 jgg Exp $

 /* ######################################################################
 
    Acquire Item - Item to acquire
 /* ######################################################################
 
    Acquire Item - Item to acquire


@@ -419,7 +419,7 @@ bool pkgAcqArchive::QueueNext()
 /* */
 void pkgAcqArchive::Done(string Message,unsigned long Size,string Md5Hash)
 {
 /* */
 void pkgAcqArchive::Done(string Message,unsigned long Size,string Md5Hash)
 {

-   Item::Done(Message,Size,MD5);
+   Item::Done(Message,Size,Md5Hash);

    
    // Check the size
    if (Size != Version->Size)
    
    // Check the size
    if (Size != Version->Size)

diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc
index 8b1de6fb32daf49801ae9ca964fe391b221b1052..e25b26b6a32a4847e52e4f61144a196ef3ae6061 100644 (file)
--- a/apt-pkg/acquire-method.cc
+++ b/apt-pkg/acquire-method.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: acquire-method.cc,v 1.14 1998/12/05 04:19:01 jgg Exp $
+// $Id: acquire-method.cc,v 1.15 1999/01/24 21:16:04 jgg Exp $

 /* ######################################################################
 
    Acquire Method
 /* ######################################################################
 
    Acquire Method


@@ -148,7 +148,7 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt)
                      TimeRFC1123(Res.LastModified).c_str());
 
    if (Res.MD5Sum.empty() == false)
                      TimeRFC1123(Res.LastModified).c_str());
 
    if (Res.MD5Sum.empty() == false)

-      End += snprintf(End,sizeof(S) - (End - S),"MD5Sum: %s\n",Res.MD5Sum.c_str());
+      End += snprintf(End,sizeof(S) - (End - S),"MD5-Hash: %s\n",Res.MD5Sum.c_str());

 
    if (Res.ResumePoint != 0)
       End += snprintf(End,sizeof(S) - (End - S),"Resume-Point: %u\n",
 
    if (Res.ResumePoint != 0)
       End += snprintf(End,sizeof(S) - (End - S),"Resume-Point: %u\n",


@@ -171,7 +171,7 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt)
                         TimeRFC1123(Alt->LastModified).c_str());
       
       if (Alt->MD5Sum.empty() == false)
                         TimeRFC1123(Alt->LastModified).c_str());
       
       if (Alt->MD5Sum.empty() == false)

-        End += snprintf(End,sizeof(S) - (End - S),"Alt-MD5Sum: %s\n",
+        End += snprintf(End,sizeof(S) - (End - S),"Alt-MD5-Hash: %s\n",

                         Alt->MD5Sum.c_str());
       
       if (Alt->IMSHit == true)
                         Alt->MD5Sum.c_str());
       
       if (Alt->IMSHit == true)