diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2019-02-26 12:42:42 +0100 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2019-02-26 16:31:20 +0100 |
| commit | 91e1f7d49830289d8e9d3fdd7ebbe7544a9838b8 (patch) | |
| tree | 30bf0e0e803377afcea8a619342ce887377ea2a6 /apt-private | |
| parent | 975316780b2ba3d4e60592fac9d4eb99ffc4c924 (diff) | |
acquire: Fold pkgAcquireStatus2 into pkgAcquireStatus
Clean up the code, make it neat, lalala
Diffstat (limited to 'apt-private')
| -rw-r--r-- | apt-private/acqprogress.cc | 6 | ||||
| -rw-r--r-- | apt-private/acqprogress.h | 2 |
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; |