diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2010-02-18 00:04:26 +0100 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2010-02-18 00:04:26 +0100 |
| commit | 897165afb4681cff0e3a4bcb65f21b6d67718fbe (patch) | |
| tree | b397d6918f45cfc55a36e012f6d3e9c257c60d72 | |
| parent | d328fd1a20543192a7ea3eac124f10a5793743e9 (diff) | |
* apt-pkg/deb/dpkgpm.cc:
- stdin redirected to /dev/null takes all CPU (Closes: #569488)
Thanks to Aurelien Jarno for providing (again) a patch!
| -rw-r--r-- | apt-pkg/deb/dpkgpm.cc | 2 | ||||
| -rw-r--r-- | debian/changelog | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 565f01b84..3dca2b209 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -1005,7 +1005,7 @@ bool pkgDPkgPM::Go(int OutStatusFd) // wait for input or output here FD_ZERO(&rfds); - if (!stdin_is_dev_null) + if (master >= 0 && !stdin_is_dev_null) FD_SET(0, &rfds); FD_SET(_dpkgin, &rfds); if(master >= 0) diff --git a/debian/changelog b/debian/changelog index df16a69dd..baa1fff93 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,9 @@ apt (0.7.26) UNRELEASED; urgency=low - add APT::FTPArchive::AlwaysStat to disable the too aggressive caching if versions are build multiply times (not recommend) Patch by Christoph Goehre, thanks! (Closes: #463260) + * apt-pkg/deb/dpkgpm.cc: + - stdin redirected to /dev/null takes all CPU (Closes: #569488) + Thanks to Aurelien Jarno for providing (again) a patch! [ Ivan Masár ] * Slovak translation update. Closes: #568294 |