summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmdline/apt-cdrom.cc12
-rw-r--r--cmdline/apt-get.cc4
2 files changed, 10 insertions, 6 deletions
diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index 1985c22a6..c312ca30d 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.7 1998/12/04 23:33:18 jgg Exp $
+// $Id: apt-cdrom.cc,v 1.8 1998/12/08 23:52:23 jgg Exp $
/* ######################################################################
APT CDROM - Tool for handling APT's CDROM database.
@@ -57,7 +57,10 @@ bool FindPackages(string CD,vector<string> &List, int Depth = 0)
stat("Packages.gz",&Buf) == 0)
{
List.push_back(CD);
- return true;
+
+ // Continue down if thorough is given
+ if (_config->FindB("APT::CDROM::Thorough",false) == false)
+ return true;
}
DIR *D = opendir(".");
@@ -972,9 +975,10 @@ int main(int argc,const char *argv[])
{'r',"rename","APT::CDROM::Rename",0},
{'m',"no-mount","APT::CDROM::NoMount",0},
{'f',"fast","APT::CDROM::Fast",0},
- {'n',"just-print","APT::CDROM::NoAct",0},
+ {'n',"just-print","APT::CDROM::NoAct",0},
{'n',"recon","APT::CDROM::NoAct",0},
- {'n',"no-act","APT::CDROM::NoAct",0},
+ {'n',"no-act","APT::CDROM::NoAct",0},
+ {'a',"thorough","APT::CDROM::Thorough",0},
{'c',"config-file",0,CommandLine::ConfigFile},
{'o',"option",0,CommandLine::ArbItem},
{0,0,0,0}};
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 07086b72f..fbfaf7303 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: apt-get.cc,v 1.27 1998/12/07 00:34:24 jgg Exp $
+// $Id: apt-get.cc,v 1.28 1998/12/08 23:52:24 jgg Exp $
/* ######################################################################
apt-get - Cover for dpkg
@@ -485,7 +485,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true)
if (Cache->DelCount() == 0 && Cache->InstCount() == 0 &&
Cache->BadCount() == 0)
- return true;
+ return true;
// Run the simulator ..
if (_config->FindB("APT::Get::Simulate") == true)