From: Michael Vogt <egon@bottom>
Date: Wed, 3 Oct 2007 07:55:04 +0000 (+0200)
Subject: merged from the dpkg-log branch
X-Git-Tag: 0.7.24ubuntu1~120^2~35
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/ff6bb5727e35159acd061f77cc462a741d2c978e?ds=inline

merged from the dpkg-log branch
---

ff6bb5727e35159acd061f77cc462a741d2c978e
diff --cc apt-pkg/deb/dpkgpm.cc
index 92f96620f,f83214344..4323b5fd2
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@@ -818,16 -833,17 +841,16 @@@ bool pkgDPkgPM::Go(int OutStatusFd
  	 tv.tv_sec = 1;
  	 tv.tv_usec = 0;
  	 select_ret = select(max(master, _dpkgin)+1, &rfds, NULL, NULL, &tv);
- 	 if (select_ret == 0) 
-   	    continue;
-   	 else if (select_ret < 0 && errno == EINTR)
-   	    continue;
-   	 else if (select_ret < 0) 
-  	 {
-   	    perror("select() returned error");
-   	    continue;
-   	 } 
- 	 
+  	 if (select_ret == 0) 
+  	    continue;
+  	 else if (select_ret < 0 && errno == EINTR)
+  	    continue;
+  	 else if (select_ret < 0) 
+ 	 {
+  	    perror("select() returned error");
+  	    continue;
+  	 } 
+ 
 -
  	 if(master >= 0 && FD_ISSET(master, &rfds))
  	    DoTerminalPty(master);
  	 if(master >= 0 && FD_ISSET(0, &rfds))