add APT::Status-deb822-Fd

[ntk/apt.git] / apt-private / private-install.cc

diff --git a/apt-private/private-install.cc b/apt-private/private-install.cc
index d1066c8..1d2acee 100644 (file)
--- a/apt-private/private-install.cc
+++ b/apt-private/private-install.cc
@@ -23,7 +23,8 @@
 #include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/pkgrecords.h>
 #include <apt-pkg/indexfile.h>
-#include <apt-pkg/iprogress.h>
+
+#include <apt-private/private-progress.h>
 
 #include <set>
 #include <locale.h>
@@ -104,12 +105,14 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask, bool Safety)
    if (_config->FindB("APT::Get::Simulate") == true)
    {
       pkgSimulate PM(Cache);
+
       int status_fd = _config->FindI("APT::Status-Fd",-1);
       APT::Progress::PackageManager *progress = NULL;
       if (status_fd > 0)
          progress = new APT::Progress::PackageManagerProgressFd(status_fd);
       pkgPackageManager::OrderResult Res = PM.DoInstall(progress);
       delete progress;
+
       if (Res == pkgPackageManager::Failed)
         return false;
       if (Res != pkgPackageManager::Completed)
@@ -340,9 +343,14 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask, bool Safety)
       
       // FIXME: make this a factory
       // select the right progress
-      int status_fd = _config->FindI("APT::Status-Fd",-1);
+      int status_fd = _config->FindI("APT::Status-Fd", -1);
+      int status_deb822_fd = _config->FindI("APT::Status-deb822-Fd", -1);
+
       APT::Progress::PackageManager *progress = NULL;
-      if (status_fd > 0)
+      if (status_deb822_fd > 0)
+         progress = new APT::Progress::PackageManagerProgressDeb822Fd(
+            status_deb822_fd);
+      else if (status_fd > 0)
          progress = new APT::Progress::PackageManagerProgressFd(status_fd);
       else if(_config->FindB("Dpkg::Progress-Fancy", false) == true)
          progress = new APT::Progress::PackageManagerFancy();