Преглед изворни кода

* apt-pkg/deb/dpkgpm.cc:
- revert termios patch (LP: #338514)

Michael Vogt пре 17 година
родитељ
комит
494c293c52
2 измењених фајлова са 8 додато и 3 уклоњено
  1. 1 3
      apt-pkg/deb/dpkgpm.cc
  2. 7 0
      debian/changelog

+ 1 - 3
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");

+ 7 - 0
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 ]