diff options
| -rw-r--r-- | cmdline/apt-get.cc | 19 | ||||
| -rw-r--r-- | doc/apt-get.8.yo | 7 | ||||
| -rw-r--r-- | doc/sources.list.5.yo | 4 |
3 files changed, 20 insertions, 10 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 4bc14a7c6..d7580c2f3 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.44 1999/03/06 02:13:48 jgg Exp $ +// $Id: apt-get.cc,v 1.45 1999/03/17 19:45:05 jgg Exp $ /* ###################################################################### apt-get - Cover for dpkg @@ -579,7 +579,8 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,bool Saftey = return false; // Fail safe check - if (_config->FindB("APT::Get::Assume-Yes",false) == true) + if (_config->FindI("quiet",0) >= 2 || + _config->FindB("APT::Get::Assume-Yes",false) == true) { if (Fail == true && _config->FindB("APT::Get::Force-Yes",false) == false) return _error->Error("There are problems and -y was used without --force-yes"); @@ -601,15 +602,17 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,bool Saftey = // Prompt to continue if (Ask == true) { - if (_config->FindI("quiet",0) < 2 || + if (_config->FindI("quiet",0) < 2 && _config->FindB("APT::Get::Assume-Yes",false) == false) + { c2out << "Do you want to continue? [Y/n] " << flush; - if (YnPrompt() == false) - { - c2out << "Abort." << endl; - exit(1); - } + if (YnPrompt() == false) + { + c2out << "Abort." << endl; + exit(1); + } + } } } diff --git a/doc/apt-get.8.yo b/doc/apt-get.8.yo index b4a468afb..f57b62e00 100644 --- a/doc/apt-get.8.yo +++ b/doc/apt-get.8.yo @@ -136,8 +136,11 @@ those packages and handle the result. Use of this option together with dit(bf(-q, --quiet)) Quiet; produces output suitable for logging, omitting progress indicators. -More qs will produce more quite up to a maximum of 2. You can also use -bf(-q=#) to set the quiet level, overriding the configuration file. +More qs will produce more quiet up to a maximum of 2. You can also use +bf(-q=#) to set the quiet level, overriding the configuration file. Note that +quiet level 2 implies -y, you should never use -qq without a no-action +modifier such as -d, --print-uris or -s as APT may decided to do something +you did not expect. See bf(quiet) dit(bf(-s, --simulate, --just-print, --dry-run, --recon, --no-act)) diff --git a/doc/sources.list.5.yo b/doc/sources.list.5.yo index bec7efed0..e468ce3d4 100644 --- a/doc/sources.list.5.yo +++ b/doc/sources.list.5.yo @@ -57,6 +57,10 @@ preferred source listed first. Typically this will result in sorting by speed from fastest to slowest (CD-ROM followed by hosts on a local network, followed by distant Internet hosts, for example). +Some examples: +verb(deb http://http.us.debian.org/debian stable main contrib non-free) +verb(deb http://http.us.debian.org/debian dists/stable-updates) + manpagesection(URI specification) The currently recognized URI types are cdrom, file, http, and ftp. |