From 63037b4d08624246ec4079dfd921cf9d58eb1e85 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@ubuntu.com>
Date: Thu, 27 Dec 2012 00:04:27 +0100
Subject: [PATCH] * apt-pkg/deb/dpkgpm.cc: - use tcgetattr() on STDOUT
instead of STDIN so that term.log works for redirected stdin
---
apt-pkg/deb/dpkgpm.cc | 2 +-
debian/changelog | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 6cb8bc6b6..fd1e6e085 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/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)
diff --git a/debian/changelog b/debian/changelog
index 1dc31af9f..3b9a9bafd 100644
--- a/debian/changelog
+++ b/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
--
2.47.2