summaryrefslogtreecommitdiff
path: root/apt-private
diff options
context:
space:
mode:
Diffstat (limited to 'apt-private')
-rw-r--r--apt-private/acqprogress.cc6
-rw-r--r--apt-private/acqprogress.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/apt-private/acqprogress.cc b/apt-private/acqprogress.cc
index a788ec98b..6cf200f5b 100644
--- a/apt-private/acqprogress.cc
+++ b/apt-private/acqprogress.cc
@@ -33,7 +33,7 @@
// ---------------------------------------------------------------------
/* */
AcqTextStatus::AcqTextStatus(std::ostream &out, unsigned int &ScreenWidth,unsigned int const Quiet) :
- pkgAcquireStatus2(), out(out), ScreenWidth(ScreenWidth), LastLineLength(0), ID(0), Quiet(Quiet)
+ pkgAcquireStatus(), out(out), ScreenWidth(ScreenWidth), LastLineLength(0), ID(0), Quiet(Quiet)
{
// testcases use it to disable pulses without disabling other user messages
if (Quiet == 0 && _config->FindB("quiet::NoUpdate", false) == true)
@@ -335,10 +335,10 @@ bool AcqTextStatus::ReleaseInfoChanges(metaIndex const * const L, metaIndex cons
{
if (Quiet >= 2 || isatty(STDOUT_FILENO) != 1 || isatty(STDIN_FILENO) != 1 ||
_config->FindB("APT::Get::Update::InteractiveReleaseInfoChanges", false) == false)
- return pkgAcquireStatus2::ReleaseInfoChanges(nullptr, nullptr, std::move(Changes));
+ return pkgAcquireStatus::ReleaseInfoChanges(nullptr, nullptr, std::move(Changes));
_error->PushToStack();
- auto const confirmed = pkgAcquireStatus2::ReleaseInfoChanges(L, N, std::move(Changes));
+ auto const confirmed = pkgAcquireStatus::ReleaseInfoChanges(L, N, std::move(Changes));
if (confirmed == true)
{
_error->MergeWithStack();
diff --git a/apt-private/acqprogress.h b/apt-private/acqprogress.h
index c8c211689..87b957e4b 100644
--- a/apt-private/acqprogress.h
+++ b/apt-private/acqprogress.h
@@ -15,7 +15,7 @@
#include <iostream>
#include <string>
-class APT_PUBLIC AcqTextStatus : public pkgAcquireStatus2
+class APT_PUBLIC AcqTextStatus : public pkgAcquireStatus
{
std::ostream &out;
unsigned int &ScreenWidth;