* apt-pkg/deb/dpkgpm.cc:

  - revert termios patch (LP: #338514)

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index a54c203305bdec2c1708f81d420351ad1d5f4a3e..d8c38427f57e8d9137e928b89dd616e4abd65edb 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -793,16 +793,14 @@ bool pkgDPkgPM::Go(int OutStatusFd)
       sighandler_t old_SIGHUP = signal(SIGHUP,SIG_IGN);
 
       struct   termios tt;
-      struct   termios tt_out;
       struct   winsize win;
       int      master;
       int      slave;
 
       // FIXME: setup sensible signal handling (*ick*)
       tcgetattr(0, &tt);
-      tcgetattr(1, &tt_out);
       ioctl(0, TIOCGWINSZ, (char *)&win);
-      if (openpty(&master, &slave, NULL, &tt_out, &win) < 0) 
+      if (openpty(&master, &slave, NULL, &tt, &win) < 0) 
       {
         const char *s = _("Can not write log, openpty() "
                           "failed (/dev/pts not mounted?)\n");

diff --git a/debian/changelog b/debian/changelog
index 480b42bf066c53b134fb9fa9f1f65d723b1119aa..b485c36aa2c22ad563f0997dde2654d5f68f24ba 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.7.20.2ubuntu2) UNRELEASED; urgency=low
+
+  * apt-pkg/deb/dpkgpm.cc:
+    - revert termios patch (LP: #338514)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 06 Mar 2009 10:15:15 +0100
+
 apt (0.7.20.2ubuntu1) jaunty; urgency=low
 
   [ Christian Perrier ]