diff options
| author | Michael Vogt <egon@debian-devbox> | 2013-03-01 12:08:16 +0100 |
|---|---|---|
| committer | Michael Vogt <egon@debian-devbox> | 2013-03-01 12:08:16 +0100 |
| commit | 612300483371c0e53ed0000a838bbfbbc4b919e0 (patch) | |
| tree | a9d7c1028ebcb5ec50a700ea0ba2a8600396f5e5 | |
| parent | 01b810674a34e30eb8bb913b94351cdaccd57e1c (diff) | |
| parent | b8dc791d39033030dd8b7a5ac4925c41d6820540 (diff) | |
merged from the lp:~mvo/apt/mvo branch
| -rw-r--r-- | apt-pkg/deb/dpkgpm.cc | 7 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index fd1e6e085..0e468b590 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -423,7 +423,7 @@ bool pkgDPkgPM::RunScriptsWithPkgs(const char *Cnf) void pkgDPkgPM::DoStdin(int master) { unsigned char input_buf[256] = {0,}; - ssize_t len = read(0, input_buf, sizeof(input_buf)); + ssize_t len = read(STDIN_FILENO, input_buf, sizeof(input_buf)); if (len) FileFd::Write(master, input_buf, len); else @@ -1231,6 +1231,11 @@ bool pkgDPkgPM::Go(int OutStatusFd) tcsetattr(0, TCSAFLUSH, &rtt); sigprocmask(SIG_SETMASK, &original_sigmask, 0); } + } else { + const char *s = _("Can not write log, tcgetattr() failed for stdout"); + fprintf(stderr, "%s", s); + if(d->term_out) + fprintf(d->term_out, "%s",s); } // Fork dpkg pid_t Child; diff --git a/debian/changelog b/debian/changelog index 9f4dca04e..36b5bd9d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,8 @@ apt (0.9.8~exp1) UNRELEASED; urgency=low * apt-pkg/deb/dpkgpm.cc: - use tcgetattr() on STDOUT instead of STDIN so that term.log works for redirected stdin + - print error in log if tcgetattr() fails instead of writing + a empty file -- David Kalnischkies <kalnischkies@gmail.com> Mon, 09 Jul 2012 17:36:40 +0200 |