diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2019-02-26 16:31:25 +0100 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2019-02-26 16:31:25 +0100 |
| commit | 3b13b8a0b79d625d2913518529a34e92b4f41539 (patch) | |
| tree | 404745c04c1eb4548bd6151034229c98d97d36f6 /apt-private/acqprogress.cc | |
| parent | 4935c8af8acd8856211c0a527bf4dec4dace0d08 (diff) | |
| parent | e1024dc0acf72b9615c0821f005364543775a58a (diff) | |
Merge branch 'pu/abi6'
Diffstat (limited to 'apt-private/acqprogress.cc')
| -rw-r--r-- | apt-private/acqprogress.cc | 6 |
1 files changed, 3 insertions, 3 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(); |