summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2013-11-01 10:42:49 +0100
committerMichael Vogt <mvo@debian.org>2013-11-01 10:42:49 +0100
commit61f954bff040809e7ab57b3adec2fe95339ffb94 (patch)
treee9a2dd360db4e42e00d2658d6535d7b44ecf3ab1 /apt-pkg
parent213a00a43774ad41d1a59c82fe042390026ab048 (diff)
small documentation updates0.9.13_exp1
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/algorithms.h2
-rw-r--r--apt-pkg/contrib/fileutl.cc3
-rw-r--r--apt-pkg/install-progress.cc4
3 files changed, 7 insertions, 2 deletions
diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index 80f6578eb..5a9a77415 100644
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -40,11 +40,11 @@
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/acquire.h>
-// include pkg{DistUpgrade,AllUpgrade,MiniizeUpgrade} here for compatiblity
using std::ostream;
#endif
#ifndef APT_9_CLEANER_HEADERS
+// include pkg{DistUpgrade,AllUpgrade,MiniizeUpgrade} here for compatiblity
#include <apt-pkg/upgrade.h>
#include <apt-pkg/update.h>
#endif
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 2347ef140..d2be276c7 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -769,6 +769,7 @@ pid_t ExecFork()
{
set<int> KeepFDs;
+ // FIXME: remove looking at APT::Keep-Fds eventually, its a hack
Configuration::Item const *Opts = _config->Tree("APT::Keep-Fds");
if (Opts != 0 && Opts->Child != 0)
{
@@ -806,7 +807,7 @@ pid_t ExecFork(std::set<int> KeepFDs)
signal(SIGTSTP,SIG_DFL);
// Close all of our FDs - just in case
- for (int K = 3; K != 40; K++)
+ for (int K = 3; K != sysconf(_SC_OPEN_MAX); K++)
{
if(KeepFDs.find(K) == KeepFDs.end())
fcntl(K,F_SETFD,FD_CLOEXEC);
diff --git a/apt-pkg/install-progress.cc b/apt-pkg/install-progress.cc
index b341fe686..09b1bef9e 100644
--- a/apt-pkg/install-progress.cc
+++ b/apt-pkg/install-progress.cc
@@ -13,6 +13,10 @@
namespace APT {
namespace Progress {
+
+/* Return a APT::Progress::PackageManager based on the global
+ * apt configuration (i.e. APT::Status-Fd and APT::Status-deb822-Fd)
+ */
PackageManager* PackageManagerProgressFactory()
{
// select the right progress