* apt-pkg/deb/dpkgpm.{cc,h}:

  - give up timeslice on EIO error in read from master terminal
* apt-pkg/deb/dpkgpm.{cc,h}:
  - rewrite dpkgpm.cc to use pselect() instead of select()
    to block signals during select() (LP: #134858)

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index ff0a3c44345c34791dce7ea75ecfc7d732fac1df..7a6b222f685cd59677b7327e70bf899f7f17187c 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -358,7 +358,15 @@ void pkgDPkgPM::DoTerminalPty(int master)
    char term_buf[1024] = {0,};
 
    int len=read(master, term_buf, sizeof(term_buf));
-   if(len <= 0)
+   if(len == -1 && errno == EIO)
+   {
+      // this happens when the child is about to exit, we
+      // give it time to actually exit, otherwise we run
+      // into a race
+      usleep(500000);
+      return;
+   }  
+   if(len <= 0) 
       return;
    write(1, term_buf, len);
    if(term_out)
@@ -819,7 +827,12 @@ bool pkgDPkgPM::Go(int OutStatusFd)
 
       // setups fds
       fd_set rfds;
-      struct timeval tv;
+      struct timespec tv;
+      sigset_t sigmask;
+      sigset_t original_sigmask;
+      sigemptyset(&sigmask);
+      sigprocmask(SIG_BLOCK,&sigmask,&original_sigmask);
+
       int select_ret;
       while ((res=waitpid(Child,&Status, WNOHANG)) != Child) {
         if(res < 0) {
@@ -842,8 +855,9 @@ bool pkgDPkgPM::Go(int OutStatusFd)
         if(master >= 0)
            FD_SET(master, &rfds);
         tv.tv_sec = 1;
-        tv.tv_usec = 0;
-        select_ret = select(max(master, _dpkgin)+1, &rfds, NULL, NULL, &tv);
+        tv.tv_nsec = 0;
+        select_ret = pselect(max(master, _dpkgin)+1, &rfds, NULL, NULL, 
+                             &tv, &original_sigmask);
         if (select_ret == 0) 
            continue;
         else if (select_ret < 0 && errno == EINTR)

diff --git a/configure.in b/configure.in
index 8683773c8ae58cd0de5b7001e1d691f5b4f10e89..e6757c7a67c9f069d92450ae4e619c9180762fb1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.7.6ubuntu14")
+AC_DEFINE_UNQUOTED(VERSION,"0.7.6ubuntu14.1")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

diff --git a/debian/changelog b/debian/changelog
index 1bf5b95afb5385fd330398fb58fb40d799b77fb7..572c93ee07cf0aa3b1bc88f1c22850a5e2fba07b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,17 @@
 apt (0.7.6ubuntu14.1) gutsy-proposed; urgency=low
 
+  [ Michael Vogt ]
+  * apt-pkg/deb/dpkgpm.{cc,h}:
+    - give up timeslice on EIO error in read from master terminal
   * debian/apt.cron.daily:
     - only run the cron job if apt-get check succeeds (LP: #131719)
+
+  [ Martin Emrich ]  
+  * apt-pkg/deb/dpkgpm.{cc,h}:
+    - rewrite dpkgpm.cc to use pselect() instead of select()
+      to block signals during select() (LP: #134858)
  
- -- Michael Vogt <michael.vogt@ubuntu.com>  Mo, 15 Oct 2007 22:56:22 +0200
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Sat, 20 Oct 2007 07:51:12 +0200
 
 apt (0.7.6ubuntu14) gutsy; urgency=low