small documentation updates

diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index 80f6578eb4c9a8d9e88b0f1a5bb121a2769c87b0..5a9a77415e2764b04a43e9e725d00c892ec05f5b 100644 (file)
--- 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 2347ef14034b38417e81b3e8cab4b40b804c3c3c..d2be276c71a6eeaa9969b038e024fab573349fd7 100644 (file)
--- 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 b341fe6860302fc1a40fab341bf0c2d19c484952..09b1bef9e6687a0a1179659d2f59e12b90e9070e 100644 (file)
--- 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

diff --git a/debian/changelog b/debian/changelog
index 5c31210aaf07fd5adbe8fe29602c8de9bd9ec401..e6bdcb1fa7fefc934aa89dfd48b1de17bd6878b8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ apt (0.9.13~exp1) experimental; urgency=low
   * prepare next ABI via #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
   * add new pid_t ExecFork(std::set<int> KeepFDs)
   * Avoid flickering when "apt-get -o DpkgPM::Progress-Fancy=1" is use
+  * use sysconf(_SC_OPEN_MAX) in ExecFork()
 
  -- Michael Vogt <mvo@debian.org>  Fri, 01 Nov 2013 10:03:06 +0100