aboutsummaryrefslogtreecommitdiff
path: root/src/clients
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-10-24 09:32:40 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-10-24 09:32:40 +0100
commit7cd0c2d122a5b38c5a925dac52b429c99e7f5085 (patch)
tree3263a593a314a0f91c8d14005b61a8a134325ae1 /src/clients
parent95de300935276509248c6ad2f6a08bf458ef290c (diff)
downloadpaludis-7cd0c2d122a5b38c5a925dac52b429c99e7f5085.tar.gz
paludis-7cd0c2d122a5b38c5a925dac52b429c99e7f5085.tar.xz
Paludis is about choices.
Diffstat (limited to 'src/clients')
-rw-r--r--src/clients/accerso/command_line.hh2
-rw-r--r--src/clients/adjutrix/find_unused_packages.cc3
-rw-r--r--src/clients/adjutrix/keywords_graph.cc44
-rw-r--r--src/clients/adjutrix/what_needs_keywording.cc3
-rw-r--r--src/clients/importare/command_line.cc1
-rw-r--r--src/clients/inquisitio/key_extractor.cc50
-rw-r--r--src/clients/instruo/command_line.hh2
-rw-r--r--src/clients/instruo/instruo.cc9
-rw-r--r--src/clients/paludis/applets.cc18
-rw-r--r--src/clients/paludis/info.cc15
-rwxr-xr-xsrc/clients/paludis/install_TEST22
-rwxr-xr-xsrc/clients/paludis/install_TEST_setup.sh54
-rw-r--r--src/clients/qualudis/qualudis.cc15
13 files changed, 130 insertions, 108 deletions
diff --git a/src/clients/accerso/command_line.hh b/src/clients/accerso/command_line.hh
index 14052a2..16131d0 100644
--- a/src/clients/accerso/command_line.hh
+++ b/src/clients/accerso/command_line.hh
@@ -22,8 +22,6 @@
#include <paludis/args/args.hh>
#include <paludis/util/instantiation_policy.hh>
-#include <paludis/args/debug_build_arg.hh>
-#include <paludis/args/checks_arg.hh>
#include <paludis/args/log_level_arg.hh>
#include <paludis/args/deps_option_arg.hh>
diff --git a/src/clients/adjutrix/find_unused_packages.cc b/src/clients/adjutrix/find_unused_packages.cc
index 6d0953c..51a6054 100644
--- a/src/clients/adjutrix/find_unused_packages.cc
+++ b/src/clients/adjutrix/find_unused_packages.cc
@@ -51,9 +51,6 @@ void do_find_unused_packages(const NoConfigEnvironment & env)
if (env.master_repository() && r->name() == env.master_repository()->name())
continue;
- if (! (*r).use_interface())
- continue;
-
Context repo_context("When searching for unused packages in repository '" + stringify(r->name()) + "':");
FindUnusedPackagesTask task(&env, &(*r));
diff --git a/src/clients/adjutrix/keywords_graph.cc b/src/clients/adjutrix/keywords_graph.cc
index c3c2b4f..94638ce 100644
--- a/src/clients/adjutrix/keywords_graph.cc
+++ b/src/clients/adjutrix/keywords_graph.cc
@@ -26,6 +26,7 @@
#include <paludis/util/sequence.hh>
#include <paludis/util/set.hh>
#include <paludis/util/indirect_iterator-impl.hh>
+#include <paludis/util/log.hh>
#include <paludis/repository.hh>
#include <paludis/package_database.hh>
#include <paludis/metadata_key.hh>
@@ -34,6 +35,7 @@
#include <paludis/filter.hh>
#include <paludis/filtered_generator.hh>
#include <paludis/selection.hh>
+#include <paludis/choice.hh>
#include <tr1/functional>
#include <set>
#include <map>
@@ -80,12 +82,30 @@ namespace
if (packages->empty())
return;
- if (! repo.use_interface())
- throw InternalError(PALUDIS_HERE, "Repository has no use_interface");
+ std::set<std::string> arch_flags;
+ for (PackageIDSequence::ConstIterator p(packages->begin()), p_end(packages->end()) ;
+ p != p_end ; ++p)
+ {
+ if (! (*p)->choices_key())
+ continue;
+
+ for (Choices::ConstIterator c((*p)->choices_key()->value()->begin()), c_end((*p)->choices_key()->value()->end()) ;
+ c != c_end ; ++c)
+ {
+ if ((*c)->raw_name() != "ARCH")
+ continue;
- std::tr1::shared_ptr<const UseFlagNameSet> arch_flags(repo.use_interface()->arch_flags());
- if (arch_flags->empty())
+ for (Choice::ConstIterator i((*c)->begin()), i_end((*c)->end()) ;
+ i != i_end ; ++i)
+ arch_flags.insert(stringify((*i)->unprefixed_name()));
+ }
+ }
+
+ if (arch_flags.empty())
+ {
+ Log::get_instance()->message("adjutrix.keywords_graph.no_arch_flags", ll_warning, lc_context) << "Couldn't find any arch flags";
return;
+ }
std::set<SlotName> slots;
std::transform(indirect_iterator(packages->begin()), indirect_iterator(packages->end()),
@@ -99,8 +119,8 @@ namespace
std::tr1::bind(std::tr1::mem_fn(&PackageID::canonical_form), _2, idcf_version))
)->canonical_form(idcf_version).length() + 1);
- unsigned tallest_arch_name(std::max(stringify(*std::max_element(arch_flags->begin(),
- arch_flags->end(), CompareByStringLength<UseFlagName>())).length(), static_cast<std::size_t>(6)));
+ unsigned tallest_arch_name(std::max(stringify(*std::max_element(arch_flags.begin(),
+ arch_flags.end(), CompareByStringLength<std::string>())).length(), static_cast<std::size_t>(6)));
unsigned longest_slot_name(stringify(*std::max_element(slots.begin(),
slots.end(), CompareByStringLength<SlotName>())).length());
@@ -108,13 +128,13 @@ namespace
for (unsigned h = 0 ; h < tallest_arch_name ; ++h)
{
cout << std::left << std::setw(version_specs_columns_width) << " " << "| ";
- for (UseFlagNameSet::ConstIterator a(arch_flags->begin()), a_end(arch_flags->end()) ;
+ for (std::set<std::string>::const_iterator a(arch_flags.begin()), a_end(arch_flags.end()) ;
a != a_end ; ++a)
{
- if ((tallest_arch_name - h) > a->data().length())
+ if ((tallest_arch_name - h) > a->length())
cout << " ";
else
- cout << a->data().at(a->data().length() - tallest_arch_name + h) << " ";
+ cout << a->at(a->length() - tallest_arch_name + h) << " ";
}
cout << "| ";
if ((tallest_arch_name - h) <= 6)
@@ -130,7 +150,7 @@ namespace
}
cout << std::string(version_specs_columns_width, '-') << "+"
- << std::string(arch_flags->size() * 2 + 1, '-') << "+"
+ << std::string(arch_flags.size() * 2 + 1, '-') << "+"
<< std::string(longest_slot_name + 3, '-') << endl;
SlotName old_slot("first_slot");
@@ -143,14 +163,14 @@ namespace
if (p->slot() != old_slot)
if (old_slot != SlotName("first_slot"))
cout << std::string(version_specs_columns_width, '-') << "+"
- << std::string(arch_flags->size() * 2 + 1, '-') << "+"
+ << std::string(arch_flags.size() * 2 + 1, '-') << "+"
<< std::string(longest_slot_name + 3, '-') << endl;
cout << std::left << std::setw(version_specs_columns_width) << p->canonical_form(idcf_version) << "| ";
std::tr1::shared_ptr<const KeywordNameSet> keywords(p->keywords_key()->value());
- for (UseFlagNameSet::ConstIterator a(arch_flags->begin()), a_end(arch_flags->end()) ;
+ for (std::set<std::string>::const_iterator a(arch_flags.begin()), a_end(arch_flags.end()) ;
a != a_end ; ++a)
{
if (keywords->end() != keywords->find(KeywordName(stringify(*a))))
diff --git a/src/clients/adjutrix/what_needs_keywording.cc b/src/clients/adjutrix/what_needs_keywording.cc
index e3a81ed..551ce55 100644
--- a/src/clients/adjutrix/what_needs_keywording.cc
+++ b/src/clients/adjutrix/what_needs_keywording.cc
@@ -65,8 +65,7 @@ int do_what_needs_keywording(NoConfigEnvironment & env)
}
KeywordName target_keyword(*CommandLine::get_instance()->begin_parameters());
- UseFlagName target_arch(strip_leading_string(
- *CommandLine::get_instance()->begin_parameters(), "~"));
+ std::string target_arch(strip_leading_string(*CommandLine::get_instance()->begin_parameters(), "~"));
(*env.main_repository()).e_interface()->set_profile_by_arch(target_arch);
env.set_accept_unstable('~' == stringify(target_keyword).at(0));
diff --git a/src/clients/importare/command_line.cc b/src/clients/importare/command_line.cc
index be5ed3b..db163ca 100644
--- a/src/clients/importare/command_line.cc
+++ b/src/clients/importare/command_line.cc
@@ -64,7 +64,6 @@ CommandLine::CommandLine() :
add_usage_line("[ --install ] [ --location path/ ] category/package [ version ] [ slot ]");
install_args.a_add_to_world_spec.remove();
- install_args.a_checks.remove();
install_args.a_fetch.remove();
install_args.a_no_safe_resume.remove();
diff --git a/src/clients/inquisitio/key_extractor.cc b/src/clients/inquisitio/key_extractor.cc
index de34313..5ceb986 100644
--- a/src/clients/inquisitio/key_extractor.cc
+++ b/src/clients/inquisitio/key_extractor.cc
@@ -31,6 +31,7 @@
#include <paludis/stringify_formatter.hh>
#include <paludis/dep_spec.hh>
#include <paludis/environment.hh>
+#include <paludis/choice.hh>
#include <tr1/functional>
#include <algorithm>
@@ -158,6 +159,12 @@ namespace
result |= _m(stringify(s));
}
+ void visit_leaf(const PlainTextLabelDepSpec & s)
+ {
+ if (! result)
+ result |= _m(stringify(s));
+ }
+
void visit_leaf(const DependencyLabelsDepSpec & s)
{
if (! result)
@@ -235,18 +242,7 @@ namespace
result = _m(stringify(*s.value()));
}
- void visit(const MetadataCollectionKey<UseFlagNameSet> & s)
- {
- using namespace std::tr1::placeholders;
-
- if (_flatten)
- result = _m(join(s.value()->begin(), s.value()->end(), " "));
- else
- result = s.value()->end() != std::find_if(s.value()->begin(), s.value()->end(),
- std::tr1::bind(&Matcher::operator(), std::tr1::cref(_m), std::tr1::bind(&stringify<UseFlagName>, _1)));
- }
-
- void visit(const MetadataCollectionKey<IUseFlagSet> & s)
+ void visit(const MetadataCollectionKey<KeywordNameSet> & s)
{
using namespace std::tr1::placeholders;
@@ -254,18 +250,34 @@ namespace
result = _m(join(s.value()->begin(), s.value()->end(), " "));
else
result = s.value()->end() != std::find_if(s.value()->begin(), s.value()->end(),
- std::tr1::bind(&Matcher::operator(), std::tr1::cref(_m), std::tr1::bind(&stringify<IUseFlag>, _1)));
+ std::tr1::bind(&Matcher::operator(), std::tr1::cref(_m), std::tr1::bind(&stringify<KeywordName>, _1)));
}
- void visit(const MetadataCollectionKey<KeywordNameSet> & s)
+ void visit(const MetadataValueKey<std::tr1::shared_ptr<const Choices> > & s)
{
- using namespace std::tr1::placeholders;
-
if (_flatten)
- result = _m(join(s.value()->begin(), s.value()->end(), " "));
+ {
+ std::string r;
+ for (Choices::ConstIterator c(s.value()->begin()), c_end(s.value()->end()) ;
+ c != c_end ; ++c)
+ for (Choice::ConstIterator i((*c)->begin()), i_end((*c)->end()) ;
+ i != i_end ; ++i)
+ {
+ if (! r.empty())
+ r.append(" ");
+ r.append(stringify((*i)->name_with_prefix()));
+ }
+
+ result = _m(r);
+ }
else
- result = s.value()->end() != std::find_if(s.value()->begin(), s.value()->end(),
- std::tr1::bind(&Matcher::operator(), std::tr1::cref(_m), std::tr1::bind(&stringify<KeywordName>, _1)));
+ {
+ for (Choices::ConstIterator c(s.value()->begin()), c_end(s.value()->end()) ;
+ c != c_end && ! result ; ++c)
+ for (Choice::ConstIterator i((*c)->begin()), i_end((*c)->end()) ;
+ i != i_end && ! result ; ++i)
+ result = _m(stringify((*i)->name_with_prefix()));
+ }
}
void visit(const MetadataCollectionKey<Set<std::string> > & s)
diff --git a/src/clients/instruo/command_line.hh b/src/clients/instruo/command_line.hh
index 3cf46e1..3addac0 100644
--- a/src/clients/instruo/command_line.hh
+++ b/src/clients/instruo/command_line.hh
@@ -22,8 +22,6 @@
#include <paludis/args/args.hh>
#include <paludis/util/instantiation_policy.hh>
-#include <paludis/args/debug_build_arg.hh>
-#include <paludis/args/checks_arg.hh>
#include <paludis/args/log_level_arg.hh>
#include <paludis/args/deps_option_arg.hh>
diff --git a/src/clients/instruo/instruo.cc b/src/clients/instruo/instruo.cc
index 759fbd6..4bb6615 100644
--- a/src/clients/instruo/instruo.cc
+++ b/src/clients/instruo/instruo.cc
@@ -149,14 +149,9 @@ namespace
const std::tr1::shared_ptr<const KeywordNameSet> & PALUDIS_ATTRIBUTE((unused)) s(k.value());
}
- void visit(const MetadataCollectionKey<IUseFlagSet> & k)
+ void visit(const MetadataValueKey<std::tr1::shared_ptr<const Choices> > & k)
{
- const std::tr1::shared_ptr<const IUseFlagSet> & PALUDIS_ATTRIBUTE((unused)) s(k.value());
- }
-
- void visit(const MetadataCollectionKey<UseFlagNameSet> & k)
- {
- const std::tr1::shared_ptr<const UseFlagNameSet> & PALUDIS_ATTRIBUTE((unused)) s(k.value());
+ const std::tr1::shared_ptr<const Choices> & PALUDIS_ATTRIBUTE((unused)) s(k.value());
}
void visit(const MetadataSectionKey & k)
diff --git a/src/clients/paludis/applets.cc b/src/clients/paludis/applets.cc
index 5ec03b1..658f47d 100644
--- a/src/clients/paludis/applets.cc
+++ b/src/clients/paludis/applets.cc
@@ -89,6 +89,12 @@ namespace
return_code |= 1;
}
+ void visit(const MetadataValueKey<std::tr1::shared_ptr<const Choices> > &)
+ {
+ std::cout << "(unprintable)" << std::endl;
+ return_code |= 1;
+ }
+
void visit(const MetadataSpecTreeKey<PlainTextSpecTree> & k)
{
StringifyFormatter f;
@@ -143,18 +149,6 @@ namespace
std::cout << k.pretty_print_flat(f) << std::endl;
}
- void visit(const MetadataCollectionKey<IUseFlagSet> & k)
- {
- StringifyFormatter f;
- std::cout << k.pretty_print_flat(f) << std::endl;
- }
-
- void visit(const MetadataCollectionKey<UseFlagNameSet> & k)
- {
- StringifyFormatter f;
- std::cout << k.pretty_print_flat(f) << std::endl;
- }
-
void visit(const MetadataCollectionKey<Set<std::string> > & k)
{
StringifyFormatter f;
diff --git a/src/clients/paludis/info.cc b/src/clients/paludis/info.cc
index 5199064..2100eef 100644
--- a/src/clients/paludis/info.cc
+++ b/src/clients/paludis/info.cc
@@ -184,28 +184,21 @@ namespace
cout << std::setw(30) << (indent + k.human_name() + ":") << " " << k.pretty_print_flat(f) << endl;
}
- void visit(const MetadataCollectionKey<IUseFlagSet> & k)
- {
- ColourFormatter f;
- cout << std::setw(30) << (indent + k.human_name() + ":") << " " << k.pretty_print_flat(f) << endl;
- }
-
- void visit(const MetadataCollectionKey<UseFlagNameSet> & k)
+ void visit(const MetadataCollectionKey<Set<std::string> > & k)
{
ColourFormatter f;
cout << std::setw(30) << (indent + k.human_name() + ":") << " " << k.pretty_print_flat(f) << endl;
}
- void visit(const MetadataCollectionKey<Set<std::string> > & k)
+ void visit(const MetadataCollectionKey<Sequence<std::string> > & k)
{
ColourFormatter f;
cout << std::setw(30) << (indent + k.human_name() + ":") << " " << k.pretty_print_flat(f) << endl;
}
- void visit(const MetadataCollectionKey<Sequence<std::string> > & k)
+ void visit(const MetadataValueKey<std::tr1::shared_ptr<const Choices> > & k)
{
- ColourFormatter f;
- cout << std::setw(30) << (indent + k.human_name() + ":") << " " << k.pretty_print_flat(f) << endl;
+ cout << std::setw(30) << (indent + k.human_name() + ":") << " " << endl;
}
};
}
diff --git a/src/clients/paludis/install_TEST b/src/clients/paludis/install_TEST
index 62ffb98..f59742c 100755
--- a/src/clients/paludis/install_TEST
+++ b/src/clients/paludis/install_TEST
@@ -2,34 +2,34 @@
for c in vdb_config exndbam_config ; do
- PALUDIS_HOME=./install_TEST_dir/config/ ./paludis --environment :install-test-$c \
+ PALUDIS_HOME=./install_TEST_dir/config-checks-always/ ./paludis --environment :install-test-$c \
--list-packages || exit 12
- PALUDIS_HOME=./install_TEST_dir/config/ ./paludis --environment :install-test-$c \
+ PALUDIS_HOME=./install_TEST_dir/config-checks-always/ ./paludis --environment :install-test-$c \
--query test-category/target || exit 13
- PALUDIS_HOME=./install_TEST_dir/config/ ./paludis --environment :install-test-$c \
+ PALUDIS_HOME=./install_TEST_dir/config-checks-always/ ./paludis --environment :install-test-$c \
--has-version test-category/target && exit 1
- PALUDIS_HOME=./install_TEST_dir/config/ ./paludis --environment :install-test-$c \
+ PALUDIS_HOME=./install_TEST_dir/config-checks-always/ ./paludis --environment :install-test-$c \
--install target --resume-command-template `pwd`/install_TEST_dir/resume \
- --checks always && exit 2
+ && exit 2
( echo -n './paludis ' ; cut -d ' ' -f2- < install_TEST_dir/resume ) > install_TEST_dir/fixedresume
cat install_TEST_dir/fixedresume
- PALUDIS_HOME=./install_TEST_dir/config/ bash `pwd`/install_TEST_dir/fixedresume --checks none || exit 3
+ PALUDIS_HOME=./install_TEST_dir/config-checks-none/ bash `pwd`/install_TEST_dir/fixedresume || exit 3
./install_TEST_dir/root/usr/bin/testbin | grep success >/dev/null || exit 4
grep target install_TEST_dir/root/world-${c%_config} || exit 5
- PALUDIS_HOME=./install_TEST_dir/config/ ./paludis --environment :install-test-$c \
+ PALUDIS_HOME=./install_TEST_dir/config-checks-always/ ./paludis --environment :install-test-$c \
--has-version test-category/target || exit 6
- PALUDIS_HOME=./install_TEST_dir/config/ ./paludis --environment :install-test-$c \
+ PALUDIS_HOME=./install_TEST_dir/config-checks-always/ ./paludis --environment :install-test-$c \
--contents test-category/target || exit 12
- PALUDIS_HOME=./install_TEST_dir/config/ ./paludis --environment :install-test-$c \
+ PALUDIS_HOME=./install_TEST_dir/config-checks-always/ ./paludis --environment :install-test-$c \
--uninstall target || exit 7
[[ -f ./install_TEST_dir/root/usr/bin/testbin ]] && exit 8
- PALUDIS_HOME=./install_TEST_dir/config/ ./paludis --environment :install-test-$c \
+ PALUDIS_HOME=./install_TEST_dir/config-checks-always/ ./paludis --environment :install-test-$c \
--has-version test-category/target && exit 9
grep target install_TEST_dir/root/world-${c%_config} >/dev/null && exit 10
- PALUDIS_HOME=./install_TEST_dir/config/ ./paludis --environment :install-test-$c \
+ PALUDIS_HOME=./install_TEST_dir/config-checks-always/ ./paludis --environment :install-test-$c \
-qMD test-category/target || exit 11
rm -fr install_TEST_dir/root/usr/{share/doc,bin}
diff --git a/src/clients/paludis/install_TEST_setup.sh b/src/clients/paludis/install_TEST_setup.sh
index cd02d83..342fc3c 100755
--- a/src/clients/paludis/install_TEST_setup.sh
+++ b/src/clients/paludis/install_TEST_setup.sh
@@ -5,43 +5,60 @@ mkdir install_TEST_dir || exit 1
cd install_TEST_dir || exit 1
mkdir -p build
-mkdir -p config/.paludis-install-test-vdb_config
-cat <<END > config/.paludis-install-test-vdb_config/specpath.conf
+mkdir -p config-checks-always/.paludis-install-test-vdb_config
+cat <<END > config-checks-always/.paludis-install-test-vdb_config/specpath.conf
root = `pwd`/root
-config-suffix = vdb
+config-suffix = vdb-checks-always
END
-mkdir -p config/.paludis-install-test-exndbam_config
-cat <<END > config/.paludis-install-test-exndbam_config/specpath.conf
+mkdir -p config-checks-always/.paludis-install-test-exndbam_config
+cat <<END > config-checks-always/.paludis-install-test-exndbam_config/specpath.conf
root = `pwd`/root
-config-suffix = exndbam
+config-suffix = exndbam-checks-always
+END
+
+mkdir -p config-checks-none/.paludis-install-test-vdb_config
+cat <<END > config-checks-none/.paludis-install-test-vdb_config/specpath.conf
+root = `pwd`/root
+config-suffix = vdb-checks-none
+END
+
+mkdir -p config-checks-none/.paludis-install-test-exndbam_config
+cat <<END > config-checks-none/.paludis-install-test-exndbam_config/specpath.conf
+root = `pwd`/root
+config-suffix = exndbam-checks-none
END
for c in vdb exndbam ; do
+ mkdir -p root/${SYSCONFDIR}/paludis-${c}-checks-{always,none}/repositories
+ cat <<END > root/${SYSCONFDIR}/paludis-${c}-checks-always/use.conf
+*/* foo build_options: optional_tests recommended_tests
+END
- mkdir -p root/${SYSCONFDIR}/paludis-${c}/repositories
- cat <<END > root/${SYSCONFDIR}/paludis-${c}/use.conf
-*/* foo
+ cat <<END > root/${SYSCONFDIR}/paludis-${c}-checks-none/use.conf
+*/* foo build_options: -optional_tests -recommended_tests
END
- cat <<END > root/${SYSCONFDIR}/paludis-${c}/environment.conf
+ for d in always none ; do
+
+ cat <<END > root/${SYSCONFDIR}/paludis-${c}-checks-${d}/environment.conf
world = `pwd`/root/world-${c}
END
- cat <<END > root/${SYSCONFDIR}/paludis-${c}/licenses.conf
+ cat <<END > root/${SYSCONFDIR}/paludis-${c}-checks-${d}/licenses.conf
*/* *
END
- cat <<END > root/${SYSCONFDIR}/paludis-${c}/keywords.conf
+ cat <<END > root/${SYSCONFDIR}/paludis-${c}-checks-${d}/keywords.conf
*/* test
END
- cat <<END > root/${SYSCONFDIR}/paludis-${c}/bashrc
+ cat <<END > root/${SYSCONFDIR}/paludis-${c}-checks-${d}/bashrc
export CHOST="my-chost"
export USER_BASHRC_WAS_USED=yes
END
- cat <<END > root/${SYSCONFDIR}/paludis-${c}/repositories/repo1.conf
+ cat <<END > root/${SYSCONFDIR}/paludis-${c}-checks-${d}/repositories/repo1.conf
location = `pwd`/repo1
cache = /var/empty
format = ebuild
@@ -50,9 +67,12 @@ profiles = \${location}/profiles/testprofile \${location}/profiles/anothertestpr
builddir = `pwd`/build
END
+ done
+
done
-cat <<END > root/${SYSCONFDIR}/paludis-vdb/repositories/installed.conf
+for d in always none ; do
+ cat <<END > root/${SYSCONFDIR}/paludis-vdb-checks-${d}/repositories/installed.conf
location = `pwd`/root/var/db/pkg
format = vdb
names_cache = /var/empty
@@ -60,12 +80,14 @@ provides_cache = /var/empty
builddir = `pwd`/build
END
-cat <<END > root/${SYSCONFDIR}/paludis-exndbam/repositories/installed.conf
+ cat <<END > root/${SYSCONFDIR}/paludis-exndbam-checks-${d}/repositories/installed.conf
location = `pwd`/root/var/db/exndbam
format = exndbam
builddir = `pwd`/build
END
+done
+
mkdir -p root/tmp
mkdir -p root/var/db/pkg
mkdir -p root/var/db/exndbam
diff --git a/src/clients/qualudis/qualudis.cc b/src/clients/qualudis/qualudis.cc
index b5fe133..dd5f151 100644
--- a/src/clients/qualudis/qualudis.cc
+++ b/src/clients/qualudis/qualudis.cc
@@ -77,11 +77,6 @@ namespace
std::ostringstream stream;
StringifyFormatter formatter;
- void visit(const MetadataCollectionKey<IUseFlagSet> & k)
- {
- stream << k.raw_name() << ": " << join(k.value()->begin(), k.value()->end(), " ") << "\n";
- }
-
void visit(const MetadataCollectionKey<Set<std::string> > & k)
{
stream << k.raw_name() << ": " << join(k.value()->begin(), k.value()->end(), " ") << "\n";
@@ -97,11 +92,6 @@ namespace
stream << k.raw_name() << ": " << join(k.value()->begin(), k.value()->end(), " ") << "\n";
}
- void visit(const MetadataCollectionKey<UseFlagNameSet> & k)
- {
- stream << k.raw_name() << ": " << join(k.value()->begin(), k.value()->end(), " ") << "\n";
- }
-
void visit(const MetadataCollectionKey<KeywordNameSet> & k)
{
stream << k.raw_name() << ": " << join(k.value()->begin(), k.value()->end(), " ") << "\n";
@@ -187,6 +177,11 @@ namespace
stream << k.raw_name() << "\n";
}
+ void visit(const MetadataValueKey<std::tr1::shared_ptr<const Choices> > & k)
+ {
+ stream << k.raw_name() << "\n";
+ }
+
void visit(const MetadataSectionKey & k)
{
stream << k.raw_name() << "\n";