From 0c95c765d688cd001988521315c708afb9892195 Mon Sep 17 00:00:00 2001
From: Arch Librarian <arch@canonical.com>
Date: Mon, 20 Sep 2004 16:53:10 +0000
Subject: Doc updates and -qq fix Author: jgg Date: 1999-03-17 19:45:05 GMT Doc
 updates and -qq fix

---
 cmdline/apt-get.cc | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'cmdline/apt-get.cc')

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);
+	    }     
+	 }	 
       }      
    }
    
-- 
cgit v1.2.3