Просмотр исходного кода

* apt-pkg/deb/dpkgpm.cc:
- use tcgetattr() on STDOUT instead of STDIN so that term.log
works for redirected stdin

Michael Vogt лет назад: 13
Родитель
Сommit
63037b4d08
2 измененных файлов с 6 добавлено и 1 удалено
  1. 1 1
      apt-pkg/deb/dpkgpm.cc
  2. 5 0
      debian/changelog

+ 1 - 1
apt-pkg/deb/dpkgpm.cc

@@ -1205,7 +1205,7 @@ bool pkgDPkgPM::Go(int OutStatusFd)
 
       // if tcgetattr does not return zero there was a error
       // and we do not do any pty magic
-      if (tcgetattr(0, &tt) == 0)
+      if (tcgetattr(STDOUT_FILENO, &tt) == 0)
       {
 	 ioctl(0, TIOCGWINSZ, (char *)&win);
 	 if (openpty(&master, &slave, NULL, &tt, &win) < 0) 

+ 5 - 0
debian/changelog

@@ -2,6 +2,11 @@ apt (0.9.7.8) UNRELEASED; urgency=low
 
   [ Manpages translation updates ]
   * Italian (Beatrice Torracca). Closes: #696601
+  
+  [ Michael Vogt ]
+  * apt-pkg/deb/dpkgpm.cc:
+    - use tcgetattr() on STDOUT instead of STDIN so that term.log
+      works for redirected stdin
 
  -- Christian Perrier <bubulle@debian.org>  Mon, 24 Dec 2012 07:01:20 +0100