Просмотр исходного кода

* fix missing SetExecClose() call when the status-fd is used
(LP: #136767)

Michael Vogt лет назад: 19
Родитель
Сommit
dde60c5696
2 измененных файлов с 5 добавлено и 1 удалено
  1. 2 0
      apt-pkg/packagemanager.h
  2. 3 1
      debian/changelog

+ 2 - 0
apt-pkg/packagemanager.h

@@ -91,6 +91,8 @@ class pkgPackageManager : protected pkgCache::Namespace
 
 
    // stuff that needs to be done after the fork
    // stuff that needs to be done after the fork
    OrderResult DoInstallPostFork(int statusFd=-1) {
    OrderResult DoInstallPostFork(int statusFd=-1) {
+      if(statusFd > 0)
+	 SetCloseExec(statusFd, true);
       bool goResult = Go(statusFd);
       bool goResult = Go(statusFd);
       if(goResult == false) 
       if(goResult == false) 
 	 return Failed;
 	 return Failed;

+ 3 - 1
debian/changelog

@@ -6,8 +6,10 @@ apt (0.7.6ubuntu9) gutsy; urgency=low
     - increase MaxPipeDepth for the internal worker<->method
     - increase MaxPipeDepth for the internal worker<->method
       communication to 1000 for the debtorrent backend
       communication to 1000 for the debtorrent backend
   * make apt build with g++ 4.3
   * make apt build with g++ 4.3
+  * fix missing SetExecClose() call when the status-fd is used
+    (LP: #136767)
 
 
- -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 10 Sep 2007 14:57:53 +0200
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 11 Sep 2007 20:55:00 +0200
 
 
 apt (0.7.6ubuntu8) gutsy; urgency=low
 apt (0.7.6ubuntu8) gutsy; urgency=low