diff options
author | Michael Vogt <mvo@debian.org> | 2013-11-28 20:04:14 +0100 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2013-11-28 20:04:14 +0100 |
commit | 05f4e3b8441a3dc867ea7956736202a93b36e95b (patch) | |
tree | b8c117fd2c139eed91ce86fc785064a16e5908dd /apt-pkg/deb | |
parent | 17ab57f41a249fabb15cdbeeff5a5c0942ccf4ac (diff) | |
parent | f832a745920c988188c64ba018d1e2b436627ad5 (diff) |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
debian/changelog
Diffstat (limited to 'apt-pkg/deb')
-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 1a8790f29..8ab0c74c6 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -416,6 +416,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"); @@ -1379,6 +1380,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) { |