From 5e9458e285af11c7fa4308add10d250e3546c8bf Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Mon, 14 Oct 2013 08:42:48 +0200
Subject: re-add APT::Keep-Fds:: for the dpkg status-fd in dpkgpm.cc as we
 always need this

---
 apt-pkg/packagemanager.cc | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

(limited to 'apt-pkg/packagemanager.cc')

diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 32bc5284e..3690a64c3 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -26,7 +26,6 @@
 #include <apt-pkg/sptr.h>
 
 #include <iostream>
-#include <fcntl.h>
 
 #include <apti18n.h>
 									/*}}}*/
@@ -1034,18 +1033,11 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
 pkgPackageManager::OrderResult 
 pkgPackageManager::DoInstallPostFork(APT::Progress::PackageManager *progress)
 {
-// FIXME: port to new structure
-#if 0
-      if(statusFd > 0)
-         // FIXME: use SetCloseExec here once it taught about throwing
-	 //        exceptions instead of doing _exit(100) on failure
-	 fcntl(statusFd,F_SETFD,FD_CLOEXEC); 
-#endif
-      bool goResult = Go(progress);
-      if(goResult == false) 
-	 return Failed;
-
-      return Res;
+   bool goResult = Go(progress);
+   if(goResult == false) 
+      return Failed;
+   
+   return Res;
 };
 									/*}}}*/	
 // PM::DoInstall - Does the installation				/*{{{*/
-- 
cgit v1.2.3