Browse Source

move isatty() check into InitOutput()

debian/1.8.y
Michael Vogt 8 years ago
parent
commit
33b813ce44
  1. 3
      apt-private/private-output.cc
  2. 4
      cmdline/apt-get.cc
  3. 2
      cmdline/apt.cc
  4. 6
      test/integration/test-apt-cli-upgrade

3
apt-private/private-output.cc

@ -30,6 +30,9 @@ unsigned int ScreenWidth = 80 - 1; /* - 1 for the cursor */
bool InitOutput() /*{{{*/
{
if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1)
_config->Set("quiet","1");
c0out.rdbuf(cout.rdbuf());
c1out.rdbuf(cout.rdbuf());
c2out.rdbuf(cout.rdbuf());

4
cmdline/apt-get.cc

@ -1736,10 +1736,6 @@ int main(int argc,const char *argv[]) /*{{{*/
// see if we are in simulate mode
CheckSimulateMode(CmdL);
// Deal with stdout not being a tty
if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1)
_config->Set("quiet","1");
// Setup the output streams
InitOutput();

2
cmdline/apt.cc

@ -156,8 +156,6 @@ int main(int argc, const char *argv[]) /*{{{*/
<< std::endl
<< std::endl;
}
if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1)
_config->Set("quiet","1");
// See if the help should be shown
if (_config->FindB("help") == true ||

6
test/integration/test-apt-cli-upgrade

@ -16,8 +16,7 @@ setupaptarchive
APTARCHIVE=$(readlink -f ./aptarchive)
# default is to allow new dependencies
testequal "Calculating upgrade... Done
The following NEW packages will be installed:
testequal "The following NEW packages will be installed:
foo-new-dependency
The following packages will be upgraded:
foo
@ -28,7 +27,6 @@ Conf foo-new-dependency (2.0 unstable [all])
Conf foo (2.0 unstable [all])" apt upgrade -qq -s
# ensure
testequal "Calculating upgrade... Done
The following packages have been kept back:
testequal "The following packages have been kept back:
foo
0 upgraded, 0 newly installed, 0 to remove and 1 not upgraded." apt upgrade -qq -s --no-new-pkgs

Loading…
Cancel
Save