summaryrefslogtreecommitdiff
path: root/apt-pkg/deb
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2013-10-14 08:42:48 +0200
committerMichael Vogt <mvo@debian.org>2013-10-14 08:42:48 +0200
commit5e9458e285af11c7fa4308add10d250e3546c8bf (patch)
treea3c62859aa031737cb8d7487ca8d742bcd2cba87 /apt-pkg/deb
parenta22fdebf63a42026e4350ebd069512c797bc2a5b (diff)
re-add APT::Keep-Fds:: for the dpkg status-fd in dpkgpm.cc as we always need this
Diffstat (limited to 'apt-pkg/deb')
-rw-r--r--apt-pkg/deb/dpkgpm.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 36d8c829a..fbb5e4c96 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -1264,6 +1264,9 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress)
_error->DumpErrors(std::cerr);
_error->RevertToStack();
+ // this is the dpkg status-fd, we need to keep it
+ _config->Set("APT::Keep-Fds::",fd[1]);
+
// Tell the progress that its starting and fork dpkg
d->progress->Start();
pid_t Child = ExecFork();
@@ -1316,6 +1319,9 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress)
if (_config->FindB("DPkg::UseIoNice", false) == true)
ionice(Child);
+ // clear the Keep-Fd again
+ _config->Clear("APT::Keep-Fds",fd[1]);
+
// Wait for dpkg
int Status = 0;