fixed ftp but, config file bug and md5 source fetch error

Author: jgg
Date: 1999-04-11 21:23:09 GMT
fixed ftp but, config file bug and md5 source fetch error

diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index 205537eaeb62dc7ec57e0ae04951d369f02fa994..3079c68efd8dfc91d3cb52a7e1958fac7f0599f7 100644 (file)
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: acquire-item.h,v 1.18 1999/04/07 05:30:17 jgg Exp $
+// $Id: acquire-item.h,v 1.19 1999/04/11 21:23:09 jgg Exp $
 /* ######################################################################
 
    Acquire Item - Item to acquire
@@ -154,6 +154,7 @@ class pkgAcqFile : public pkgAcquire::Item
    
    // Specialized action members
    virtual void Done(string Message,unsigned long Size,string Md5Hash);
+   virtual string MD5Sum() {return MD5;};
    virtual string DescURI() {return Desc.URI;};
    
    pkgAcqFile(pkgAcquire *Owner,string URI,string MD5,unsigned long Size,

diff --git a/doc/examples/apt.conf b/doc/examples/apt.conf
index 9c617c998d0ed7b4b9a2cf9524258993976918af..93426736a166631e8be6f4f7802fb40f563ff1a1 100644 (file)
--- a/doc/examples/apt.conf
+++ b/doc/examples/apt.conf
@@ -1,4 +1,4 @@
-// $Id: apt.conf,v 1.30 1999/04/11 06:46:09 jgg Exp $
+// $Id: apt.conf,v 1.31 1999/04/11 21:23:10 jgg Exp $
 /* This file is an index of all APT configuration directives. It should
    NOT actually be used as a real config file, though it is a completely
    valid file.
@@ -48,7 +48,7 @@ APT
   };
 
   // Some general options
-  Ingore-Hold "false";
+  Ignore-Hold "false";
   Immediate-Configure "true";      // DO NOT turn this off, see the man page
 };
 

diff --git a/methods/ftp.cc b/methods/ftp.cc
index 09fbaeb7fe523fe79651fd16570775a6a52b7e3a..145858f1f6c2e6c66fcb63391d97e2a70665b457 100644 (file)
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: ftp.cc,v 1.5 1999/03/15 19:51:27 jgg Exp $
+// $Id: ftp.cc,v 1.6 1999/04/11 21:23:10 jgg Exp $
 /* ######################################################################
 
    HTTP Aquire Method - This is the FTP aquire method for APT.
@@ -286,6 +286,9 @@ bool FTPConn::Login()
 /* This performs a very simple buffered read. */
 bool FTPConn::ReadLine(string &Text)
 {
+   if (ServerFd == -1)
+      return false;
+   
    // Suck in a line
    while (Len < sizeof(Buffer))
    {
@@ -315,7 +318,7 @@ bool FTPConn::ReadLine(string &Text)
       }
       
       // Suck it back
-      int Res = read(ServerFd,Buffer,sizeof(Buffer) - Len);
+      int Res = read(ServerFd,Buffer + Len,sizeof(Buffer) - Len);
       if (Res <= 0)
       {
         Close();