diff options
| author | Arch Librarian <arch@canonical.com> | 2004-09-20 16:58:37 +0000 |
|---|---|---|
| committer | Arch Librarian <arch@canonical.com> | 2004-09-20 16:58:37 +0000 |
| commit | dd27443ee7585b4d53baa3f2d5173a3725d69b17 (patch) | |
| tree | e24d224815bfad7e8491ac6bd9896bef275530a4 | |
| parent | c86f0a01b91771152b7ef6704deb2f9cf6196446 (diff) | |
Fix bug #97364
Author: jgg
Date: 2001-08-18 22:20:40 GMT
Fix bug #97364
| -rw-r--r-- | cmdline/apt-cdrom.cc | 6 | ||||
| -rw-r--r-- | cmdline/indexcopy.cc | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc index aad4dff1a..884060e48 100644 --- 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 d7efaa949..48edb143a 100644 --- 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; |