print all messages if the application is in an interactive run

diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 2332a0f13d544eba37b898699a07afc0ef16052b..a4ec63eeda0a65544410fdfadf9004819fc610cd 100644 (file)
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1876,13 +1876,11 @@ int main(int argc,const char *argv[])                                   /*{{{*/
       CmdL.DispatchArg(CmdsB);
 
    // Print any errors or warnings found during parsing
       CmdL.DispatchArg(CmdsB);
 
    // Print any errors or warnings found during parsing

-   if (_error->empty() == false)
-   {
-      bool Errors = _error->PendingError();
+   bool const Errors = _error->PendingError();
+   if (_config->FindI("quiet",0) > 0)

       _error->DumpErrors();
       _error->DumpErrors();

-      return Errors == true?100:0;
-   }
-          
-   return 0;
+   else
+      _error->DumpErrors(GlobalError::DEBUG);
+   return Errors == true ? 100 : 0;

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/

diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index 8b9eacae67f0d8734b0e4802c3beb71f9e36f131..da2ffa3901ef53cdf557344b4d9c24e367fcb737 100644 (file)
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -273,13 +273,11 @@ int main(int argc,const char *argv[])                                     /*{{{*/
    CmdL.DispatchArg(Cmds);
 
    // Print any errors or warnings found during parsing
    CmdL.DispatchArg(Cmds);
 
    // Print any errors or warnings found during parsing

-   if (_error->empty() == false)
-   {
-      bool Errors = _error->PendingError();
+   bool const Errors = _error->PendingError();
+   if (_config->FindI("quiet",0) > 0)

       _error->DumpErrors();
       _error->DumpErrors();

-      return Errors == true?100:0;
-   }
-   
-   return 0;
+   else
+      _error->DumpErrors(GlobalError::DEBUG);
+   return Errors == true ? 100 : 0;

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 6a7d7a44842f44546fa25e07d399bce0ae9a71cb..605eedb0fa57bfea3b9ecd8b7ef9ee406d231d50 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -2920,13 +2920,11 @@ int main(int argc,const char *argv[])                                   /*{{{*/
    CmdL.DispatchArg(Cmds);
 
    // Print any errors or warnings found during parsing
    CmdL.DispatchArg(Cmds);
 
    // Print any errors or warnings found during parsing

-   if (_error->empty() == false)
-   {
-      bool Errors = _error->PendingError();
+   bool const Errors = _error->PendingError();
+   if (_config->FindI("quiet",0) > 0)

       _error->DumpErrors();
       _error->DumpErrors();

-      return Errors == true?100:0;
-   }
-   
-   return 0;   
+   else
+      _error->DumpErrors(GlobalError::DEBUG);
+   return Errors == true ? 100 : 0;

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/