summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2013-01-04 08:23:26 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2013-01-04 08:23:26 +0100
commit95795be79b0ed520d84b2db5c9c0d0c0637a43f6 (patch)
treeb9a2d144f549bd321c1250dd045c3db5163ca99e
parent0620365915671c718ae2cc181c161a254cbae67e (diff)
parent63037b4d08624246ec4079dfd921cf9d58eb1e85 (diff)
merged lp:~mvo/apt/mvo
-rw-r--r--apt-pkg/deb/dpkgpm.cc2
-rw-r--r--debian/changelog3
2 files changed, 4 insertions, 1 deletions
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 1779fc774..bc1a70d6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,9 @@ apt (0.9.8~exp1) UNRELEASED; urgency=low
* lp:~mvo/apt/config-clear:
- support Configuration.Clear() for a clear of the entire
configuration
+ * apt-pkg/deb/dpkgpm.cc:
+ - use tcgetattr() on STDOUT instead of STDIN so that term.log
+ works for redirected stdin
-- David Kalnischkies <kalnischkies@gmail.com> Mon, 09 Jul 2012 17:36:40 +0200