diff options
| author | Michael Vogt <mvo@debian.org> | 2014-02-20 16:32:48 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-02-20 16:32:48 +0100 |
| commit | bef425ae689899d3add1f6a26b888012803a7308 (patch) | |
| tree | 79ba0268c02129fbaaa1fb32c58904cb37ca1167 /apt-private | |
| parent | 74ac981563c6ccfd5291b6b6b83e193afa8aa40b (diff) | |
| parent | 1c93747533dcf1cbbb2c743d0028ad157a7684a4 (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
configure.ac
debian/changelog
test/integration/test-kernel-helper-autoremove
Diffstat (limited to 'apt-private')
| -rw-r--r-- | apt-private/acqprogress.cc | 7 | ||||
| -rw-r--r-- | apt-private/acqprogress.h | 2 | ||||
| -rw-r--r-- | apt-private/private-cacheset.h | 5 |
3 files changed, 11 insertions, 3 deletions
diff --git a/apt-private/acqprogress.cc b/apt-private/acqprogress.cc index af2d0f461..d25ffef75 100644 --- a/apt-private/acqprogress.cc +++ b/apt-private/acqprogress.cc @@ -30,10 +30,13 @@ using namespace std; // AcqTextStatus::AcqTextStatus - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ -AcqTextStatus::AcqTextStatus(unsigned int &ScreenWidth,unsigned int Quiet) : - ScreenWidth(ScreenWidth), ID(0), Quiet(Quiet) +AcqTextStatus::AcqTextStatus(unsigned int &ScreenWidth,unsigned int const Quiet) : + pkgAcquireStatus(), ScreenWidth(ScreenWidth), ID(0), Quiet(Quiet) { BlankLine[0] = 0; + // testcases use it to disable pulses without disabling other user messages + if (Quiet == 0 && _config->FindB("quiet::NoUpdate", false) == true) + this->Quiet = 1; } /*}}}*/ // AcqTextStatus::Start - Downloading has started /*{{{*/ diff --git a/apt-private/acqprogress.h b/apt-private/acqprogress.h index e47bfb72d..e12dafe50 100644 --- a/apt-private/acqprogress.h +++ b/apt-private/acqprogress.h @@ -32,7 +32,7 @@ class AcqTextStatus : public pkgAcquireStatus bool Pulse(pkgAcquire *Owner); - AcqTextStatus(unsigned int &ScreenWidth,unsigned int Quiet); + AcqTextStatus(unsigned int &ScreenWidth,unsigned int const Quiet); }; #endif diff --git a/apt-private/private-cacheset.h b/apt-private/private-cacheset.h index 15b531e9d..322b3be6b 100644 --- a/apt-private/private-cacheset.h +++ b/apt-private/private-cacheset.h @@ -101,6 +101,11 @@ public: Pkg.FullName(true).c_str(), pattern.c_str()); explicitlyNamed = false; } + virtual void showFnmatchSelection(pkgCache::PkgIterator const &Pkg, std::string const &pattern) { + ioprintf(out, _("Note, selecting '%s' for glob '%s'\n"), + Pkg.FullName(true).c_str(), pattern.c_str()); + explicitlyNamed = false; + } virtual void showRegExSelection(pkgCache::PkgIterator const &Pkg, std::string const &pattern) { ioprintf(out, _("Note, selecting '%s' for regex '%s'\n"), Pkg.FullName(true).c_str(), pattern.c_str()); |