merged from the lp:~mvo/apt/mvo branch

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index fd1e6e085231fea7c79b92a68e1cda7be9334e70..0e468b590a8dff59619ecb4823b071a891b04c42 100644 (file)
--- 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 9f4dca04e5a13443682834873a6ca1b80d14f599..36b5bd9d11a915b1e1fe62704af1c45287b5e7be 100644 (file)
--- 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