diff options
author | Daniel Nicoletti <dantti12@gmail.com> | 2012-04-14 08:40:32 -0300 |
---|---|---|
committer | Daniel Nicoletti <dantti12@gmail.com> | 2012-04-14 08:40:32 -0300 |
commit | 2bb0ed3633dbfa1dd69d1acfff557fd6075725e5 (patch) | |
tree | db963d00359a8545fb0f95479460e28b52f0cb4d | |
parent | 9afd0c563fd36cf49eb94b6227a27ba86e85cc4f (diff) |
aptcc: Fix INSTALLED filter
-rw-r--r-- | backends/aptcc/apt-intf.cpp | 16 | ||||
-rw-r--r-- | backends/aptcc/pk-backend-aptcc.cpp | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/backends/aptcc/apt-intf.cpp b/backends/aptcc/apt-intf.cpp index 77c20288..81566b1d 100644 --- a/backends/aptcc/apt-intf.cpp +++ b/backends/aptcc/apt-intf.cpp @@ -255,7 +255,7 @@ bool AptIntf::matchPackage(const pkgCache::VerIterator &ver, PkBitfield filters) // Check if the package is installed if (pkg->CurrentState == pkgCache::State::Installed && pkg.CurrentVer() == ver) { - installed = false; + installed = true; } // if we are on multiarch check also the arch filter @@ -363,6 +363,11 @@ void AptIntf::emitPackage(const pkgCache::VerIterator &ver, PkBitfield filters, PkInfoEnum state) { + // Check if the filters match the package + if (!matchPackage(ver, filters)) { + return; + } + const pkgCache::PkgIterator &pkg = ver.ParentPkg(); // check the state enum to see if it was not set. @@ -375,11 +380,6 @@ void AptIntf::emitPackage(const pkgCache::VerIterator &ver, } } - // Check if the filters match the package - if (!matchPackage(ver, filters)) { - return; - } - pkgCache::VerFileIterator vf = ver.FileList(); gchar *package_id; @@ -407,12 +407,12 @@ void AptIntf::emit_packages(PkgList &output, result_equality()), output.end()); - for (PkgList::iterator i = output.begin(); i != output.end(); ++i) { + for (PkgList::iterator it = output.begin(); it != output.end(); ++it) { if (_cancel) { break; } - emitPackage(*i, filters, state); + emitPackage(*it, filters, state); } } diff --git a/backends/aptcc/pk-backend-aptcc.cpp b/backends/aptcc/pk-backend-aptcc.cpp index 80c1b278..e55e859b 100644 --- a/backends/aptcc/pk-backend-aptcc.cpp +++ b/backends/aptcc/pk-backend-aptcc.cpp @@ -1347,7 +1347,7 @@ static gboolean backend_get_packages_thread(PkBackend *backend) return false; } - pk_backend_set_status (backend, PK_STATUS_ENUM_QUERY); + pk_backend_set_status(backend, PK_STATUS_ENUM_QUERY); PkgList output; output.reserve(m_apt->packageCache->HeaderP->PackageCount); for (pkgCache::PkgIterator pkg = m_apt->packageCache->PkgBegin(); |