summaryrefslogtreecommitdiff
path: root/apt-private/private-install.cc
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2013-10-21 22:11:40 +0200
committerMichael Vogt <mvo@debian.org>2013-10-21 22:11:40 +0200
commitc7ea1ebaef0edebfe41353f93a81ee2ada5870a8 (patch)
treeaf40749886aa5bb4323fd52cee04f0c780a87b91 /apt-private/private-install.cc
parent3b1b0f2900347ef2836c7ee4cc3ee20c6cdcb621 (diff)
add APT::Status-deb822-Fd
Diffstat (limited to 'apt-private/private-install.cc')
-rw-r--r--apt-private/private-install.cc11
1 files changed, 8 insertions, 3 deletions
diff --git a/apt-private/private-install.cc b/apt-private/private-install.cc
index 8d72faecc..1d2acee6c 100644
--- 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>
@@ -342,10 +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();