Only do openpty() if both stdin/stdout are terminals

Closes: 746434

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index c52b83c6ee26e278f445d131d9133c930bd5e532..e410594df7717a9416f64487d342334834d8827d 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -1053,14 +1053,15 @@ void pkgDPkgPM::StartPtyMagic()
    }
 
    // setup the pty and stuff
    }
 
    // setup the pty and stuff

-   struct      winsize win;
+   struct winsize win;

 
 

-   // if tcgetattr does not return zero there was a error
-   // and we do not do any pty magic
+   // if tcgetattr for both stdin/stdout returns 0 (no error)
+   // we do the pty magic

    _error->PushToStack();
    _error->PushToStack();

-   if (tcgetattr(STDOUT_FILENO, &d->tt) == 0)
+   if (tcgetattr(STDIN_FILENO, &d->tt) == 0 &&
+       tcgetattr(STDOUT_FILENO, &d->tt) == 0)

    {
    {

-       if (ioctl(1, TIOCGWINSZ, (char *)&win) < 0)
+       if (ioctl(STDOUT_FILENO, TIOCGWINSZ, (char *)&win) < 0)

        {
            _error->Errno("ioctl", _("ioctl(TIOCGWINSZ) failed"));
        } else if (openpty(&d->master, &d->slave, NULL, &d->tt, &win) < 0)
        {
            _error->Errno("ioctl", _("ioctl(TIOCGWINSZ) failed"));
        } else if (openpty(&d->master, &d->slave, NULL, &d->tt, &win) < 0)

diff --git a/test/integration/test-failing-maintainer-scripts b/test/integration/test-failing-maintainer-scripts
index cb82ebc7a3eb88fb6bd5658f2890ad519d572825..3dd7d643eed490588fcf6663acb66b4e2927faca 100755 (executable)
--- a/test/integration/test-failing-maintainer-scripts
+++ b/test/integration/test-failing-maintainer-scripts
@@ -86,7 +86,7 @@ testmyfailure() {
        testfailure "$@" -o APT::Status-Fd=3
        msgtest 'Test for failure message of maintainerscript in' 'console log'
        local TEST='rootdir/tmp/testfailure.output'
        testfailure "$@" -o APT::Status-Fd=3
        msgtest 'Test for failure message of maintainerscript in' 'console log'
        local TEST='rootdir/tmp/testfailure.output'

-       if grep -q 'exit status 29$' "$TEST"; then
+       if grep -q 'exit status 29' "$TEST"; then

                msgpass
        else
                cat $TEST
                msgpass
        else
                cat $TEST