Fixed bug#34944: apt-get should not print progress on n...

Author: jgg
Date: 1999-03-27 01:30:38 GMT
Fixed bug#34944: apt-get should not print progress on non-tty

diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index a235ad9a17f82dbaf58f8ad9902736a99e70fac8..31247f2058afc8e6d4b3cff314c8c581c74e39b6 100644 (file)
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: apt-cache.cc,v 1.30 1999/03/18 04:52:51 jgg Exp $
+// $Id: apt-cache.cc,v 1.31 1999/03/27 01:30:38 jgg Exp $
 /* ######################################################################
    
    apt-cache - Manages the cache files
@@ -675,6 +675,10 @@ int main(int argc,const char *argv[])
        CmdL.FileSize() == 0)
       return ShowHelp(CmdL);
 
+   // Deal with stdout not being a tty
+   if (ttyname(STDOUT_FILENO) == 0 && _config->FindI("quiet",0) < 1)
+      _config->Set("quiet","1");
+
    if (CmdL.DispatchArg(CmdsA,false) == false && _error->PendingError() == false)
    {      
       // Open the cache file

diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index 85d2fa3e83c0661ba40146531a168adb91deb8fa..459e4a48d7f037ef5beaa9828ed005c84addb2eb 100644 (file)
--- 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.17 1999/01/30 02:12:53 jgg Exp $
+// $Id: apt-cdrom.cc,v 1.18 1999/03/27 01:30:38 jgg Exp $
 /* ######################################################################
    
    APT CDROM - Tool for handling APT's CDROM database.
@@ -1025,6 +1025,10 @@ int main(int argc,const char *argv[])
    if (_config->FindB("help") == true ||
        CmdL.FileSize() == 0)
       return ShowHelp();
+
+   // Deal with stdout not being a tty
+   if (ttyname(STDOUT_FILENO) == 0 && _config->FindI("quiet",0) < 1)
+      _config->Set("quiet","1");
    
    // Match the operation
    CmdL.DispatchArg(Cmds);

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index d7580c2f3d7ed72f6cdb82ccfffd01303190f212..81c350dfa52dd2dbf5d4f5c095a19f9b3ac12633 100644 (file)
--- 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.45 1999/03/17 19:45:05 jgg Exp $
+// $Id: apt-get.cc,v 1.46 1999/03/27 01:30:38 jgg Exp $
 /* ######################################################################
    
    apt-get - Cover for dpkg
@@ -1208,6 +1208,10 @@ int main(int argc,const char *argv[])
        CmdL.FileSize() == 0)
       return ShowHelp(CmdL);
 
+   // Deal with stdout not being a tty
+   if (ttyname(STDOUT_FILENO) == 0 && _config->FindI("quiet",0) < 1)
+      _config->Set("quiet","1");
+   
    // Setup the output streams
    c0out.rdbuf(cout.rdbuf());
    c1out.rdbuf(cout.rdbuf());