Fix bug #97364

Author: jgg
Date: 2001-08-18 22:20:40 GMT
Fix bug #97364

diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index aad4dff1a02bc449a10f95829e306719d911d22e..884060e48bc44776ec5ca50ffca71b8358b3ca02 100644 (file)
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: apt-cdrom.cc,v 1.38 2001/05/27 04:46:43 jgg Exp $
+// $Id: apt-cdrom.cc,v 1.39 2001/08/18 22:20:40 jgg Exp $
 /* ######################################################################
    
    APT CDROM - Tool for handling APT's CDROM database.
@@ -63,6 +63,10 @@ bool FindPackages(string CD,vector<string> &List,vector<string> &SList,
         InfoDir = CD + ".disk/";
    }
 
+   // Don't look into directories that have been marked to ingore.
+   if (stat(".aptignr",&Bur) == 0)
+      return true;
+   
    /* Aha! We found some package files. We assume that everything under 
       this dir is controlled by those package files so we don't look down
       anymore */

diff --git a/cmdline/indexcopy.cc b/cmdline/indexcopy.cc
index d7efaa9491bb98eb7ee8d0c923d061053090dbad..48edb143accb08c9160c29c0b5f743671c507b5d 100644 (file)
--- a/cmdline/indexcopy.cc
+++ b/cmdline/indexcopy.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: indexcopy.cc,v 1.8 2001/05/27 04:47:21 jgg Exp $
+// $Id: indexcopy.cc,v 1.9 2001/08/18 22:20:40 jgg Exp $
 /* ######################################################################
 
    Index Copying - Aid for copying and verifying the index files
@@ -280,8 +280,8 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List)
    cout << '.' << endl;
    
    if (Packages == 0)
-      return _error->Warning("No valid records were found.");
-   
+      _error->Warning("No valid records were found.");
+
    if (NotFound + WrongSize > 10)
       cout << "Alot of entries were discarded, something may be wrong." << endl;