aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-04 06:06:49 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-04 06:06:49 +0000
commitd3a7b80c4d0d9c405f35fde821849e5bb400892e (patch)
tree16bdd1986136870ac28463a97a6541252e65fa05
parent73200d35a6700df5830756318a45940808bba83b (diff)
downloadpaludis-d3a7b80c4d0d9c405f35fde821849e5bb400892e.tar.gz
paludis-d3a7b80c4d0d9c405f35fde821849e5bb400892e.tar.xz
Fix the qa code to work with the API changes
-rw-r--r--paludis/qa/deps_exist_check.cc4
-rw-r--r--paludis/qa/deps_visible_check.cc3
-rw-r--r--src/qualudis/Makefile.am4
3 files changed, 6 insertions, 5 deletions
diff --git a/paludis/qa/deps_exist_check.cc b/paludis/qa/deps_exist_check.cc
index b50a1f3..10eb368 100644
--- a/paludis/qa/deps_exist_check.cc
+++ b/paludis/qa/deps_exist_check.cc
@@ -45,7 +45,7 @@ namespace
void visit(const PackageDepAtom * const p)
{
- if (env->package_database()->query(p)->empty())
+ if (env->package_database()->query(p, is_either)->empty())
{
if (in_any)
result << Message(qal_maybe, "No match for " + role + " entry '"
@@ -75,7 +75,7 @@ namespace
void visit(const BlockDepAtom * const b)
{
- if (env->package_database()->query(b->blocked_atom())->empty())
+ if (env->package_database()->query(b->blocked_atom(), is_either)->empty())
result << Message(qal_maybe, "No match for " + role + " block '!"
+ stringify(*b->blocked_atom()) + "'");
}
diff --git a/paludis/qa/deps_visible_check.cc b/paludis/qa/deps_visible_check.cc
index 8dd5fe6..dacd743 100644
--- a/paludis/qa/deps_visible_check.cc
+++ b/paludis/qa/deps_visible_check.cc
@@ -44,7 +44,8 @@ namespace
void visit(const PackageDepAtom * const p)
{
bool found(false);
- PackageDatabaseEntryCollection::Pointer matches(env->package_database()->query(p));
+ PackageDatabaseEntryCollection::Pointer matches(env->package_database()->query(p,
+ is_either));
for (PackageDatabaseEntryCollection::ReverseIterator m(matches->rbegin()),
m_end(matches->rend()) ; m != m_end ; ++m)
{
diff --git a/src/qualudis/Makefile.am b/src/qualudis/Makefile.am
index ea544bc..da9a76a 100644
--- a/src/qualudis/Makefile.am
+++ b/src/qualudis/Makefile.am
@@ -18,8 +18,8 @@ qualudis_SOURCES = \
qualudis_LDADD = \
$(top_builddir)/paludis/args/libpaludisargs.a \
$(top_builddir)/paludis/qa/libpaludisqa.a \
- $(top_builddir)/paludis/util/libpaludisutil.a \
- $(top_builddir)/paludis/libpaludis.a
+ $(top_builddir)/paludis/libpaludis.a \
+ $(top_builddir)/paludis/util/libpaludisutil.a
TESTS_ENVIRONMENT = env TEST_SCRIPT_DIR="$(srcdir)/" $(SHELL) $(top_srcdir)/test/run_test.sh bash
TESTS = version_TEST