diff options
| author | Michael Vogt <mvo@debian.org> | 2013-11-28 17:08:53 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-11-28 17:08:53 +0100 |
| commit | 96ae6de5d3d5ae31100079c78fffc5ebc4a0b81c (patch) | |
| tree | 3489aeb303d72f28b6cd96872dc1653ed74b68be /apt-pkg/deb/dpkgpm.cc | |
| parent | e4e5d47b0e66ae7bedafbdbb685114c404381204 (diff) | |
fix regression that APT::Keep-Fds is not honored (closes: #730490)
Diffstat (limited to 'apt-pkg/deb/dpkgpm.cc')
| -rw-r--r-- | apt-pkg/deb/dpkgpm.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 26d79dbb1..01c6242dc 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -417,6 +417,7 @@ bool pkgDPkgPM::RunScriptsWithPkgs(const char *Cnf) // Create the pipes std::set<int> KeepFDs; + MergeKeepFdsFromConfiguration(KeepFDs); int Pipes[2]; if (pipe(Pipes) != 0) return _error->Errno("pipe","Failed to create IPC pipe to subprocess"); @@ -1380,6 +1381,7 @@ bool pkgDPkgPM::GoNoABIBreak(APT::Progress::PackageManager *progress) d->progress->StartDpkg(); std::set<int> KeepFDs; KeepFDs.insert(fd[1]); + MergeKeepFdsFromConfiguration(KeepFDs); pid_t Child = ExecFork(KeepFDs); if (Child == 0) { |