Wichert and Espys bugs

Author: jgg
Date: 1999-03-17 03:25:25 GMT
Wichert and Espys bugs

diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index a28dce6c07022f9b4421f4222f486d4d4fef4586..0839cc963bdd639beb168ce054857eef16b09de6 100644 (file)
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: fileutl.cc,v 1.23 1999/03/16 00:43:55 jgg Exp $
+// $Id: fileutl.cc,v 1.24 1999/03/17 03:25:25 jgg Exp $

 /* ######################################################################
    
    File Utilities
 /* ######################################################################
    
    File Utilities


@@ -45,7 +45,7 @@ bool CopyFile(FileFd &From,FileFd &To)
       if (Size > 64000)
         ToRead = 64000;
       
       if (Size > 64000)
         ToRead = 64000;
       

-      if (To.Read(Buf,ToRead) == false || 
+      if (From.Read(Buf,ToRead) == false || 

          To.Write(Buf,ToRead) == false)
       {
         delete [] Buf;
          To.Write(Buf,ToRead) == false)
       {
         delete [] Buf;

diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 8a3a636954b665ed801daf9e130b78982e145904..8f47739a50eebf01778ba2640e4f39d06fd55ba6 100644 (file)
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: apt-cache.cc,v 1.28 1999/02/19 08:57:41 jgg Exp $
+// $Id: apt-cache.cc,v 1.29 1999/03/17 03:25:25 jgg Exp $

 /* ######################################################################
    
    apt-cache - Manages the cache files
 /* ######################################################################
    
    apt-cache - Manages the cache files


@@ -361,9 +361,6 @@ bool DumpAvail(CommandLine &Cmd)
 
    for (pkgCache::PkgFileIterator I = Cache.FileBegin(); I.end() == false; I++)
    {
 
    for (pkgCache::PkgFileIterator I = Cache.FileBegin(); I.end() == false; I++)
    {

-      if ((I->Flags & pkgCache::Flag::NotSource) != 0)
-        continue;
-      

       if (I.IsOk() == false)
       {
         delete [] Buffer;
       if (I.IsOk() == false)
       {
         delete [] Buffer;