* Only try to clear stdin if it is a tty, to avoid loop...

Author: mdz
Date: 2003-07-26 00:25:44 GMT
* Only try to clear stdin if it is a tty, to avoid looping if there is
lots of stuff (perhaps an infinite amount) to read (Closes: #192228)

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index ea64ef0891cb9260c85e523b25ef7d350b5b7963..1548a47d4b179b066e1205bd2441336d521ede51 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: dpkgpm.cc,v 1.26 2003/04/27 03:02:40 doogie Exp $
+// $Id: dpkgpm.cc,v 1.27 2003/07/26 00:25:44 mdz Exp $
 /* ######################################################################
 
    DPKG Package Manager - Provide an interface to dpkg
@@ -448,7 +448,7 @@ bool pkgDPkgPM::Go()
         if (chdir(_config->FindDir("DPkg::Run-Directory","/").c_str()) != 0)
            _exit(100);
         
-        if (_config->FindB("DPkg::FlushSTDIN",true) == true)
+        if (_config->FindB("DPkg::FlushSTDIN",true) == true && isatty(STDIN_FILENO))
         {
            int Flags,dummy;
            if ((Flags = fcntl(STDIN_FILENO,F_GETFL,dummy)) < 0)

diff --git a/debian/changelog b/debian/changelog
index 4352bdc4fa82fef61c3c07bc077767930a57421f..9c04f1277e40c6af9f7512051c0464518e7fdd46 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,8 +23,10 @@ apt (0.5.8) unstable; urgency=medium
     YnPrompt works correctly (Closes: #200953).  No other translations seem
     to have this problem
   * Regenerate POT file and sync .po files
+  * Only try to clear stdin if it is a tty, to avoid looping if there is
+    lots of stuff (perhaps an infinite amount) to read (Closes: #192228)
 
- --
+ -- Matt Zimmerman <mdz@debian.org>  Fri, 25 Jul 2003 20:21:53 -0400
 
 apt (0.5.7) unstable; urgency=low