summaryrefslogtreecommitdiff
path: root/cmdline
diff options
context:
space:
mode:
Diffstat (limited to 'cmdline')
-rw-r--r--cmdline/apt-cdrom.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index c312ca30d..7875b1444 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.8 1998/12/08 23:52:23 jgg Exp $
+// $Id: apt-cdrom.cc,v 1.9 1998/12/09 00:11:50 jgg Exp $
/* ######################################################################
APT CDROM - Tool for handling APT's CDROM database.
@@ -63,6 +63,7 @@ bool FindPackages(string CD,vector<string> &List, int Depth = 0)
return true;
}
+ bool Thorough = _config->FindB("APT::CDROM::Thorough",false);
DIR *D = opendir(".");
if (D == 0)
return _error->Errno("opendir","Unable to read %s",CD.c_str());
@@ -86,6 +87,9 @@ bool FindPackages(string CD,vector<string> &List, int Depth = 0)
if (S_ISDIR(Buf.st_mode) == 0)
continue;
+ if (Thorough == false && S_ISLNK(Buf.st_mode) != 0)
+ continue;
+
// Descend
if (FindPackages(CD + Dir->d_name,List,Depth+1) == false)
break;
@@ -960,6 +964,7 @@ int ShowHelp()
cout << " -r Rename a recognized CD-ROM" << endl;
cout << " -m No mounting" << endl;
cout << " -f Fast mode, don't check package files" << endl;
+ cout << " -a Thorough scan mode" << endl;
cout << " -c=? Read this configuration file" << endl;
cout << " -o=? Set an arbitary configuration option, ie -o dir::cache=/tmp" << endl;
cout << "See fstab(5)" << endl;