aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-06-14 20:03:26 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-06-15 10:42:03 +0100
commit7ce6f2a635664f48179ba58b18a24f041d467bc3 (patch)
tree33814a7743ba58a577ea8e996c8e8d777c0f5a57 /paludis/repositories
parent1f5408648013aa4ea8cb70864888274b068402e3 (diff)
downloadpaludis-7ce6f2a635664f48179ba58b18a24f041d467bc3.tar.gz
paludis-7ce6f2a635664f48179ba58b18a24f041d467bc3.tar.xz
Boring API updates for parse_user_package_dep_spec changes (continued)
Diffstat (limited to 'paludis/repositories')
-rw-r--r--paludis/repositories/e/e_installed_repository.cc3
-rw-r--r--paludis/repositories/e/e_repository_TEST.cc206
-rw-r--r--paludis/repositories/e/e_repository_sets.cc3
-rw-r--r--paludis/repositories/e/fetch_visitor_TEST.cc3
-rw-r--r--paludis/repositories/e/qa/visibility_TEST.cc20
-rw-r--r--paludis/repositories/e/vdb_repository.cc3
-rw-r--r--paludis/repositories/e/vdb_repository_TEST.cc86
-rw-r--r--paludis/repositories/unpackaged/dep_parser.cc4
-rw-r--r--paludis/repositories/unpackaged/dep_parser.hh4
-rw-r--r--paludis/repositories/unpackaged/dep_parser_TEST.cc3
-rw-r--r--paludis/repositories/unpackaged/installed_id.cc2
-rw-r--r--paludis/repositories/unpackaged/installed_repository_TEST.cc24
-rw-r--r--paludis/repositories/unpackaged/unpackaged_key.cc2
-rw-r--r--paludis/repositories/virtuals/virtuals_repository_TEST.cc14
14 files changed, 197 insertions, 180 deletions
diff --git a/paludis/repositories/e/e_installed_repository.cc b/paludis/repositories/e/e_installed_repository.cc
index b8a8da6..48338da 100644
--- a/paludis/repositories/e/e_installed_repository.cc
+++ b/paludis/repositories/e/e_installed_repository.cc
@@ -251,7 +251,8 @@ EInstalledRepository::package_set(const SetName & s) const
SetFile world(SetFileParams::create()
.file_name(_imp->params.deprecated_world)
.type(sft_simple)
- .parser(std::tr1::bind(&parse_user_package_dep_spec, _1, UserPackageDepSpecOptions()))
+ .parser(std::tr1::bind(&parse_user_package_dep_spec, _1,
+ _imp->params.environment, UserPackageDepSpecOptions(), filter::All()))
.tag(tag)
.set_operator_mode(sfsmo_natural)
.environment(_imp->params.environment));
diff --git a/paludis/repositories/e/e_repository_TEST.cc b/paludis/repositories/e/e_repository_TEST.cc
index 8e91ce3..669d6e2 100644
--- a/paludis/repositories/e/e_repository_TEST.cc
+++ b/paludis/repositories/e/e_repository_TEST.cc
@@ -495,7 +495,7 @@ namespace test_cases
TestMessageSuffix pass_suffix(stringify(pass), true);
std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-1",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
TEST_CHECK(id->short_description_key());
TEST_CHECK_EQUAL(id->short_description_key()->value(), "the-description");
@@ -540,7 +540,7 @@ namespace test_cases
const std::tr1::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-1",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
TEST_CHECK(id1->end_metadata() != id1->find_metadata("EAPI"));
TEST_CHECK(id1->short_description_key());
@@ -557,7 +557,7 @@ namespace test_cases
const std::tr1::shared_ptr<const PackageID> id2(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-2",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
TEST_CHECK(id2->end_metadata() != id2->find_metadata("EAPI"));
TEST_CHECK(id2->short_description_key());
@@ -608,7 +608,7 @@ namespace test_cases
const std::tr1::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-one/stale-pkg-1",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
TEST_CHECK(id1->end_metadata() != id1->find_metadata("EAPI"));
TEST_CHECK(id1->short_description_key());
@@ -621,7 +621,7 @@ namespace test_cases
const std::tr1::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-one/stale-pkg-1",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
TEST_CHECK(id1->end_metadata() != id1->find_metadata("EAPI"));
TEST_CHECK(id1->short_description_key());
@@ -668,7 +668,7 @@ namespace test_cases
const std::tr1::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-two-1",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
TEST_CHECK(id1->end_metadata() != id1->find_metadata("EAPI"));
TEST_CHECK_EQUAL((*std::tr1::static_pointer_cast<const erepository::ERepositoryID>(id1)->eapi())[k::name()], "UNKNOWN");
@@ -704,13 +704,13 @@ namespace test_cases
const std::tr1::shared_ptr<const PackageID> p1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-1",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
const std::tr1::shared_ptr<const PackageID> p2(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-two/pkg-two-1",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
const std::tr1::shared_ptr<const PackageID> p4(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-2",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
TEST_CHECK(repo->query_use(UseFlagName("flag1"), *p1) == use_enabled);
TEST_CHECK(repo->query_use(UseFlagName("flag2"), *p1) == use_disabled);
@@ -762,29 +762,29 @@ namespace test_cases
TEST_CHECK((*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=category/package-1::test-repo-18",
- UserPackageDepSpecOptions()))))]->begin())->masked());
+ &env, UserPackageDepSpecOptions()))))]->begin())->masked());
TEST_CHECK((*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=category/package-2::test-repo-18",
- UserPackageDepSpecOptions()))))]->begin())->masked());
+ &env, UserPackageDepSpecOptions()))))]->begin())->masked());
TEST_CHECK(! (*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=category/package-3::test-repo-18",
- UserPackageDepSpecOptions()))))]->begin())->masked());
+ &env, UserPackageDepSpecOptions()))))]->begin())->masked());
TEST_CHECK(! (*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=category/package-4::test-repo-18",
- UserPackageDepSpecOptions()))))]->begin())->masked());
+ &env, UserPackageDepSpecOptions()))))]->begin())->masked());
TEST_CHECK((*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=category/package-1::test-repo-19",
- UserPackageDepSpecOptions()))))]->begin())->masked());
+ &env, UserPackageDepSpecOptions()))))]->begin())->masked());
TEST_CHECK(! (*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=category/package-2::test-repo-19",
- UserPackageDepSpecOptions()))))]->begin())->masked());
+ &env, UserPackageDepSpecOptions()))))]->begin())->masked());
TEST_CHECK((*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=category/package-3::test-repo-19",
- UserPackageDepSpecOptions()))))]->begin())->masked());
+ &env, UserPackageDepSpecOptions()))))]->begin())->masked());
TEST_CHECK(! (*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=category/package-4::test-repo-19",
- UserPackageDepSpecOptions()))))]->begin())->masked());
+ &env, UserPackageDepSpecOptions()))))]->begin())->masked());
}
} test_e_repository_repository_masks;
@@ -815,13 +815,13 @@ namespace test_cases
TEST_CHECK((*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/masked-0",
- UserPackageDepSpecOptions()))))]->begin())->masked());
+ &env, UserPackageDepSpecOptions()))))]->begin())->masked());
TEST_CHECK(! (*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/was_masked-0",
- UserPackageDepSpecOptions()))))]->begin())->masked());
+ &env, UserPackageDepSpecOptions()))))]->begin())->masked());
TEST_CHECK(! (*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/not_masked-0",
- UserPackageDepSpecOptions()))))]->begin())->masked());
+ &env, UserPackageDepSpecOptions()))))]->begin())->masked());
}
}
} test_e_repository_query_profile_masks;
@@ -849,15 +849,15 @@ namespace test_cases
TEST_CHECK((*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/was_masked-0",
- UserPackageDepSpecOptions()))))]->begin())->masked());
+ &env, UserPackageDepSpecOptions()))))]->begin())->masked());
repo->set_profile(repo->find_profile(repo->params().location / "profiles/profile/subprofile"));
TEST_CHECK(! (*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/was_masked-0",
- UserPackageDepSpecOptions()))))]->begin())->masked());
+ &env, UserPackageDepSpecOptions()))))]->begin())->masked());
repo->set_profile(repo->find_profile(repo->params().location / "profiles/profile"));
TEST_CHECK((*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/was_masked-0",
- UserPackageDepSpecOptions()))))]->begin())->masked());
+ &env, UserPackageDepSpecOptions()))))]->begin())->masked());
}
} test_e_repository_invalidate_masks;
@@ -1015,7 +1015,7 @@ namespace test_cases
TestMessageSuffix suffix("no files", true);
const std::tr1::shared_ptr<const PackageID> no_files_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/no-files",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(no_files_id);
TEST_CHECK(no_files_id->short_description_key());
TEST_CHECK_EQUAL(no_files_id->short_description_key()->value(), "The Description");
@@ -1026,7 +1026,7 @@ namespace test_cases
TestMessageSuffix suffix("fetched files", true);
const std::tr1::shared_ptr<const PackageID> fetched_files_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/fetched-files",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(fetched_files_id);
TEST_CHECK((FSEntry("e_repository_TEST_dir") / "distdir" / "already-fetched.txt").is_regular_file());
fetched_files_id->perform_action(action);
@@ -1038,7 +1038,7 @@ namespace test_cases
TEST_CHECK(! (FSEntry("e_repository_TEST_dir") / "distdir" / "fetchable-1.txt").is_regular_file());
const std::tr1::shared_ptr<const PackageID> fetchable_files_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/fetchable-files",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(fetchable_files_id);
fetchable_files_id->perform_action(action);
TEST_CHECK((FSEntry("e_repository_TEST_dir") / "distdir" / "fetchable-1.txt").is_regular_file());
@@ -1049,7 +1049,7 @@ namespace test_cases
TEST_CHECK(! (FSEntry("e_repository_TEST_dir") / "distdir" / "arrowed.txt").is_regular_file());
const std::tr1::shared_ptr<const PackageID> arrow_files_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/arrow-files",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(arrow_files_id);
arrow_files_id->perform_action(action);
TEST_CHECK((FSEntry("e_repository_TEST_dir") / "distdir" / "arrowed.txt").is_regular_file());
@@ -1059,7 +1059,7 @@ namespace test_cases
TestMessageSuffix suffix("unfetchable files", true);
const std::tr1::shared_ptr<const PackageID> unfetchable_files_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/unfetchable-files",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(unfetchable_files_id);
TEST_CHECK_THROWS(unfetchable_files_id->perform_action(action), FetchActionError);
}
@@ -1067,7 +1067,7 @@ namespace test_cases
{
const std::tr1::shared_ptr<const PackageID> no_files_restricted_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/no-files-restricted",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(no_files_restricted_id);
no_files_restricted_id->perform_action(action);
}
@@ -1075,7 +1075,7 @@ namespace test_cases
{
const std::tr1::shared_ptr<const PackageID> fetched_files_restricted_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/fetched-files-restricted",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(fetched_files_restricted_id);
fetched_files_restricted_id->perform_action(action);
}
@@ -1083,7 +1083,7 @@ namespace test_cases
{
const std::tr1::shared_ptr<const PackageID> fetchable_files_restricted_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/fetchable-files-restricted",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(fetchable_files_restricted_id);
TEST_CHECK_THROWS(fetchable_files_restricted_id->perform_action(action), FetchActionError);
}
@@ -1115,7 +1115,7 @@ namespace test_cases
const std::tr1::shared_ptr<const PackageID> id(*env[selection::AllVersionsSorted(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("category/package",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
repo->make_manifest(id->name());
id->perform_action(action);
@@ -1176,7 +1176,7 @@ namespace test_cases
{
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=virtual/virtual-pretend-installed-0",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
}
@@ -1184,7 +1184,7 @@ namespace test_cases
TestMessageSuffix suffix("in-ebuild die", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/in-ebuild-die",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_THROWS(id->perform_action(action), InstallActionError);
}
@@ -1193,7 +1193,7 @@ namespace test_cases
TestMessageSuffix suffix("in-subshell die", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/in-subshell-die",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_THROWS(id->perform_action(action), InstallActionError);
}
@@ -1202,7 +1202,7 @@ namespace test_cases
TestMessageSuffix suffix("success", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/success",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
id->perform_action(action);
}
@@ -1211,7 +1211,7 @@ namespace test_cases
TestMessageSuffix suffix("unpack die", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/unpack-die",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_THROWS(id->perform_action(action), InstallActionError);
}
@@ -1220,7 +1220,7 @@ namespace test_cases
TestMessageSuffix suffix("econf die", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/econf-die",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_THROWS(id->perform_action(action), InstallActionError);
}
@@ -1229,7 +1229,7 @@ namespace test_cases
TestMessageSuffix suffix("emake fail", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/emake-fail",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
id->perform_action(action);
}
@@ -1238,7 +1238,7 @@ namespace test_cases
TestMessageSuffix suffix("emake die", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/emake-die",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_THROWS(id->perform_action(action), InstallActionError);
}
@@ -1247,7 +1247,7 @@ namespace test_cases
TestMessageSuffix suffix("einstall die", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/einstall-die",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_THROWS(id->perform_action(action), InstallActionError);
}
@@ -1256,7 +1256,7 @@ namespace test_cases
TestMessageSuffix suffix("keepdir die", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/keepdir-die",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_THROWS(id->perform_action(action), InstallActionError);
}
@@ -1265,7 +1265,7 @@ namespace test_cases
TestMessageSuffix suffix("dobin fail", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/dobin-fail",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
id->perform_action(action);
}
@@ -1274,7 +1274,7 @@ namespace test_cases
TestMessageSuffix suffix("dobin die", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/dobin-die",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_THROWS(id->perform_action(action), InstallActionError);
}
@@ -1283,7 +1283,7 @@ namespace test_cases
TestMessageSuffix suffix("fperms fail", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/fperms-fail",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
id->perform_action(action);
}
@@ -1292,7 +1292,7 @@ namespace test_cases
TestMessageSuffix suffix("fperms die", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/fperms-die",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_THROWS(id->perform_action(action), InstallActionError);
}
@@ -1301,7 +1301,7 @@ namespace test_cases
TestMessageSuffix suffix("econf source 0", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/econf-source-0",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_EQUAL(visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "0");
TEST_CHECK_THROWS(id->perform_action(action), InstallActionError);
@@ -1311,7 +1311,7 @@ namespace test_cases
TestMessageSuffix suffix("best version", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/best-version-0",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
id->perform_action(action);
}
@@ -1320,7 +1320,7 @@ namespace test_cases
TestMessageSuffix suffix("has version", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/has-version-0",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
id->perform_action(action);
}
@@ -1329,7 +1329,7 @@ namespace test_cases
TestMessageSuffix suffix("match", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/match-0",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
id->perform_action(action);
}
@@ -1338,7 +1338,7 @@ namespace test_cases
TestMessageSuffix suffix("vars", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/vars-0",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
id->perform_action(action);
}
@@ -1347,7 +1347,7 @@ namespace test_cases
TestMessageSuffix suffix("expand vars", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/expand-vars-0",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
id->perform_action(action);
}
@@ -1400,7 +1400,7 @@ namespace test_cases
TestMessageSuffix suffix("econf source 1", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/econf-source-1",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_EQUAL(visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "1");
id->perform_action(action);
@@ -1410,7 +1410,7 @@ namespace test_cases
TestMessageSuffix suffix("dosym success 1", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/dosym-success-1",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_EQUAL(visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "1");
id->perform_action(action);
@@ -1464,7 +1464,7 @@ namespace test_cases
TestMessageSuffix suffix("econf source kdebuild-1", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/econf-source-kdebuild-1",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_EQUAL(visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "kdebuild-1");
id->perform_action(action);
@@ -1474,7 +1474,7 @@ namespace test_cases
TestMessageSuffix suffix("banned functions kdebuild-1", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/banned-functions-kdebuild-1",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_EQUAL(visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "kdebuild-1");
TEST_CHECK_THROWS(id->perform_action(action), InstallActionError);
@@ -1484,7 +1484,7 @@ namespace test_cases
TestMessageSuffix suffix("banned vars kdebuild-1", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/banned-vars-kdebuild-1",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_EQUAL(visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "UNKNOWN");
}
@@ -1493,7 +1493,7 @@ namespace test_cases
TestMessageSuffix suffix("dosym success kdebuild-1", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/dosym-success-kdebuild-1",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_EQUAL(visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "kdebuild-1");
id->perform_action(action);
@@ -1503,7 +1503,7 @@ namespace test_cases
TestMessageSuffix suffix("dosym fail kdebuild-1", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/dosym-fail-kdebuild-1",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_EQUAL(visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "kdebuild-1");
TEST_CHECK_THROWS(id->perform_action(action), InstallActionError);
@@ -1552,7 +1552,7 @@ namespace test_cases
TestMessageSuffix suffix("info success kdebuild-1", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/info-success-kdebuild-1",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_EQUAL(visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "kdebuild-1");
id->perform_action(action);
@@ -1562,7 +1562,7 @@ namespace test_cases
TestMessageSuffix suffix("info fail kdebuild-1", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/info-fail-kdebuild-1",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_EQUAL(visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "kdebuild-1");
TEST_CHECK_THROWS(id->perform_action(action), InfoActionError);
@@ -1624,7 +1624,7 @@ namespace test_cases
TestMessageSuffix suffix("in-ebuild die", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/in-ebuild-die",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_THROWS(id->perform_action(action), InstallActionError);
}
@@ -1633,7 +1633,7 @@ namespace test_cases
TestMessageSuffix suffix("in-subshell die", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/in-subshell-die",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_THROWS(id->perform_action(action), InstallActionError);
}
@@ -1642,7 +1642,7 @@ namespace test_cases
TestMessageSuffix suffix("success", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/success",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
id->perform_action(action);
}
@@ -1651,7 +1651,7 @@ namespace test_cases
TestMessageSuffix suffix("expatch success", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/expatch-success",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
id->perform_action(action);
}
@@ -1660,7 +1660,7 @@ namespace test_cases
TestMessageSuffix suffix("expatch die", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/expatch-die",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_THROWS(id->perform_action(action), InstallActionError);
}
@@ -1669,7 +1669,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal expatch fail", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-expatch-fail",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
id->perform_action(action);
}
@@ -1678,7 +1678,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal expatch die", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-expatch-die",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_THROWS(id->perform_action(action), InstallActionError);
}
@@ -1687,7 +1687,7 @@ namespace test_cases
TestMessageSuffix suffix("unpack die", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/unpack-die",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_THROWS(id->perform_action(action), InstallActionError);
}
@@ -1696,7 +1696,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal unpack fail", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-unpack-fail",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
id->perform_action(action);
}
@@ -1705,7 +1705,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal unpack die", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-unpack-die",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_THROWS(id->perform_action(action), InstallActionError);
}
@@ -1714,7 +1714,7 @@ namespace test_cases
TestMessageSuffix suffix("econf fail", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/econf-fail",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_THROWS(id->perform_action(action), InstallActionError);
}
@@ -1723,7 +1723,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal econf", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-econf",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
id->perform_action(action);
}
@@ -1732,7 +1732,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal econf die", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-econf-die",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_THROWS(id->perform_action(action), InstallActionError);
}
@@ -1741,7 +1741,7 @@ namespace test_cases
TestMessageSuffix suffix("emake fail", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/emake-fail",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_THROWS(id->perform_action(action), InstallActionError);
}
@@ -1750,7 +1750,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal emake", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-emake",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
id->perform_action(action);
}
@@ -1759,7 +1759,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal emake die", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-emake-die",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_THROWS(id->perform_action(action), InstallActionError);
}
@@ -1768,7 +1768,7 @@ namespace test_cases
TestMessageSuffix suffix("einstall fail", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/einstall-fail",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_THROWS(id->perform_action(action), InstallActionError);
}
@@ -1777,7 +1777,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal einstall", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-einstall",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
id->perform_action(action);
}
@@ -1786,7 +1786,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal einstall die", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-einstall-die",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_THROWS(id->perform_action(action), InstallActionError);
}
@@ -1795,7 +1795,7 @@ namespace test_cases
TestMessageSuffix suffix("keepdir success", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/keepdir-success",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
id->perform_action(action);
}
@@ -1804,7 +1804,7 @@ namespace test_cases
TestMessageSuffix suffix("keepdir fail", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/keepdir-fail",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_THROWS(id->perform_action(action), InstallActionError);
}
@@ -1813,7 +1813,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal keepdir", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-keepdir",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
id->perform_action(action);
}
@@ -1822,7 +1822,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal keepdir die", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-keepdir-die",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_THROWS(id->perform_action(action), InstallActionError);
}
@@ -1831,7 +1831,7 @@ namespace test_cases
TestMessageSuffix suffix("dobin success", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/dobin-success",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
id->perform_action(action);
}
@@ -1840,7 +1840,7 @@ namespace test_cases
TestMessageSuffix suffix("dobin fail", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/dobin-fail",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_THROWS(id->perform_action(action), InstallActionError);
}
@@ -1849,7 +1849,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal dobin success", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-dobin-success",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
id->perform_action(action);
}
@@ -1858,7 +1858,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal dobin fail", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-dobin-fail",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
id->perform_action(action);
}
@@ -1867,7 +1867,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal dobin die", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-dobin-die",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_THROWS(id->perform_action(action), InstallActionError);
}
@@ -1876,7 +1876,7 @@ namespace test_cases
TestMessageSuffix suffix("fperms success", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/fperms-success",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
id->perform_action(action);
}
@@ -1885,7 +1885,7 @@ namespace test_cases
TestMessageSuffix suffix("fperms fail", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/fperms-fail",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_THROWS(id->perform_action(action), InstallActionError);
}
@@ -1894,7 +1894,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal fperms success", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-fperms-success",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
id->perform_action(action);
}
@@ -1903,7 +1903,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal fperms fail", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-fperms-fail",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
id->perform_action(action);
}
@@ -1912,7 +1912,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal fperms die", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-fperms-die",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_THROWS(id->perform_action(action), InstallActionError);
}
@@ -1921,7 +1921,7 @@ namespace test_cases
TestMessageSuffix suffix("best version", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/best-version-0",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
id->perform_action(action);
}
@@ -1930,7 +1930,7 @@ namespace test_cases
TestMessageSuffix suffix("has version", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/has-version-0",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
id->perform_action(action);
}
@@ -1939,7 +1939,7 @@ namespace test_cases
TestMessageSuffix suffix("match", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/match-0",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_THROWS(id->perform_action(action), InstallActionError);
}
@@ -1948,7 +1948,7 @@ namespace test_cases
TestMessageSuffix suffix("ever", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/ever-1.3",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK(id->short_description_key());
TEST_CHECK_EQUAL(id->short_description_key()->value(), "The Description");
@@ -1959,7 +1959,7 @@ namespace test_cases
TestMessageSuffix suffix("econf phase", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/econf-phase-0",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
TEST_CHECK_THROWS(id->perform_action(action), InstallActionError);
}
@@ -1968,7 +1968,7 @@ namespace test_cases
TestMessageSuffix suffix("econf vars", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/econf-vars-0",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
id->perform_action(action);
}
@@ -1977,7 +1977,7 @@ namespace test_cases
TestMessageSuffix suffix("expand vars", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/expand-vars-0",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
id->perform_action(action);
}
@@ -2004,7 +2004,7 @@ namespace test_cases
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("category/package",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
StringifyFormatter ff;
@@ -2078,7 +2078,7 @@ namespace test_cases
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/pkg",
- UserPackageDepSpecOptions()))))]->last());
+ &env, UserPackageDepSpecOptions()))))]->last());
TEST_CHECK(id);
id->perform_action(action);
diff --git a/paludis/repositories/e/e_repository_sets.cc b/paludis/repositories/e/e_repository_sets.cc
index 82ccaf2..a6e1bb4 100644
--- a/paludis/repositories/e/e_repository_sets.cc
+++ b/paludis/repositories/e/e_repository_sets.cc
@@ -118,7 +118,8 @@ ERepositorySets::package_set(const SetName & ss) const
.file_name(ff)
.environment(_imp->environment)
.type(sft_paludis_conf)
- .parser(std::tr1::bind(&parse_user_package_dep_spec, _1, UserPackageDepSpecOptions()))
+ .parser(std::tr1::bind(&parse_user_package_dep_spec, _1,
+ _imp->environment, UserPackageDepSpecOptions(), filter::All()))
.set_operator_mode(s.second)
.tag(tag));
diff --git a/paludis/repositories/e/fetch_visitor_TEST.cc b/paludis/repositories/e/fetch_visitor_TEST.cc
index 4cb7f5c..402e5dd 100644
--- a/paludis/repositories/e/fetch_visitor_TEST.cc
+++ b/paludis/repositories/e/fetch_visitor_TEST.cc
@@ -59,7 +59,8 @@ namespace test_cases
const std::tr1::shared_ptr<const EAPI> eapi(EAPIData::get_instance()->eapi_from_string("exheres-0"));
FetchVisitor v(&env, *env[selection::RequireExactlyOne(
- generator::Matches(parse_user_package_dep_spec("=cat/pkg-1", UserPackageDepSpecOptions())))]->begin(),
+ generator::Matches(parse_user_package_dep_spec("=cat/pkg-1",
+ &env, UserPackageDepSpecOptions())))]->begin(),
*eapi, FSEntry("fetch_visitor_TEST_dir/out"),
false, false, "test", make_shared_ptr(new URIListedThenMirrorsLabel("listed-then-mirrors")), false);
parse_fetchable_uri("file:///" + stringify(FSEntry("fetch_visitor_TEST_dir/in/input1").realpath()), &env, id, *eapi)->accept(v);
diff --git a/paludis/repositories/e/qa/visibility_TEST.cc b/paludis/repositories/e/qa/visibility_TEST.cc
index 74b8451..4e91c28 100644
--- a/paludis/repositories/e/qa/visibility_TEST.cc
+++ b/paludis/repositories/e/qa/visibility_TEST.cc
@@ -85,7 +85,7 @@ namespace test_cases
{
std::tr1::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(parse_user_package_dep_spec(
- "=cat-one/visible-1", UserPackageDepSpecOptions())))]->begin());
+ "=cat-one/visible-1", &env, UserPackageDepSpecOptions())))]->begin());
TestReporter r1;
TEST_CHECK(visibility_check(FSEntry("/var/empty"), r1, &env, repo, id1, "visibility"));
TEST_CHECK_EQUAL(r1.count, 0u);
@@ -93,7 +93,7 @@ namespace test_cases
{
std::tr1::shared_ptr<const PackageID> id2(*env[selection::RequireExactlyOne(generator::Matches(parse_user_package_dep_spec(
- "=cat-one/visible-2", UserPackageDepSpecOptions())))]->begin());
+ "=cat-one/visible-2", &env, UserPackageDepSpecOptions())))]->begin());
TestReporter r2;
TEST_CHECK(visibility_check(FSEntry("/var/empty"), r2, &env, repo, id2, "visibility"));
TEST_CHECK_EQUAL(r2.count, 0u);
@@ -101,7 +101,7 @@ namespace test_cases
{
std::tr1::shared_ptr<const PackageID> id3(*env[selection::RequireExactlyOne(generator::Matches(parse_user_package_dep_spec(
- "=cat-one/masked-1", UserPackageDepSpecOptions())))]->begin());
+ "=cat-one/masked-1", &env, UserPackageDepSpecOptions())))]->begin());
TestReporter r3;
TEST_CHECK(visibility_check(FSEntry("/var/empty"), r3, &env, repo, id3, "visibility"));
TEST_CHECK_EQUAL(r3.count, 0u);
@@ -109,7 +109,7 @@ namespace test_cases
{
std::tr1::shared_ptr<const PackageID> id4(*env[selection::RequireExactlyOne(generator::Matches(parse_user_package_dep_spec(
- "=cat-one/needs-masked-1", UserPackageDepSpecOptions())))]->begin());
+ "=cat-one/needs-masked-1", &env, UserPackageDepSpecOptions())))]->begin());
TestReporter r4;
TEST_CHECK(visibility_check(FSEntry("/var/empty"), r4, &env, repo, id4, "visibility"));
TestMessageSuffix s4(r4.messages);
@@ -118,7 +118,7 @@ namespace test_cases
{
std::tr1::shared_ptr<const PackageID> id5(*env[selection::RequireExactlyOne(generator::Matches(parse_user_package_dep_spec(
- "=cat-one/use-masking-1", UserPackageDepSpecOptions())))]->begin());
+ "=cat-one/use-masking-1", &env, UserPackageDepSpecOptions())))]->begin());
TestReporter r5;
TEST_CHECK(visibility_check(FSEntry("/var/empty"), r5, &env, repo, id5, "visibility"));
TestMessageSuffix s5(r5.messages);
@@ -127,7 +127,7 @@ namespace test_cases
{
std::tr1::shared_ptr<const PackageID> id6(*env[selection::RequireExactlyOne(generator::Matches(parse_user_package_dep_spec(
- "=cat-one/use-masking-2", UserPackageDepSpecOptions())))]->begin());
+ "=cat-one/use-masking-2", &env, UserPackageDepSpecOptions())))]->begin());
TestReporter r6;
TEST_CHECK(visibility_check(FSEntry("/var/empty"), r6, &env, repo, id6, "visibility"));
TestMessageSuffix s6(r6.messages);
@@ -136,7 +136,7 @@ namespace test_cases
{
std::tr1::shared_ptr<const PackageID> id7(*env[selection::RequireExactlyOne(generator::Matches(parse_user_package_dep_spec(
- "=cat-one/use-masking-3", UserPackageDepSpecOptions())))]->begin());
+ "=cat-one/use-masking-3", &env, UserPackageDepSpecOptions())))]->begin());
TestReporter r7;
TEST_CHECK(visibility_check(FSEntry("/var/empty"), r7, &env, repo, id7, "visibility"));
TEST_CHECK_EQUAL(r7.count, 0u);
@@ -144,7 +144,7 @@ namespace test_cases
{
std::tr1::shared_ptr<const PackageID> id8(*env[selection::RequireExactlyOne(generator::Matches(parse_user_package_dep_spec(
- "=cat-one/use-masking-4", UserPackageDepSpecOptions())))]->begin());
+ "=cat-one/use-masking-4", &env, UserPackageDepSpecOptions())))]->begin());
TestReporter r8;
TEST_CHECK(visibility_check(FSEntry("/var/empty"), r8, &env, repo, id8, "visibility"));
TEST_CHECK_EQUAL(r8.count, 0u);
@@ -152,7 +152,7 @@ namespace test_cases
{
std::tr1::shared_ptr<const PackageID> id9(*env[selection::RequireExactlyOne(generator::Matches(parse_user_package_dep_spec(
- "=cat-one/use-masking-5", UserPackageDepSpecOptions())))]->begin());
+ "=cat-one/use-masking-5", &env, UserPackageDepSpecOptions())))]->begin());
TestReporter r9;
TEST_CHECK(visibility_check(FSEntry("/var/empty"), r9, &env, repo, id9, "visibility"));
TEST_CHECK_EQUAL(r9.count, 0u);
@@ -160,7 +160,7 @@ namespace test_cases
{
std::tr1::shared_ptr<const PackageID> id10(*env[selection::RequireExactlyOne(generator::Matches(parse_user_package_dep_spec(
- "=cat-one/use-masking-6", UserPackageDepSpecOptions())))]->begin());
+ "=cat-one/use-masking-6", &env, UserPackageDepSpecOptions())))]->begin());
TestReporter r10;
TEST_CHECK(visibility_check(FSEntry("/var/empty"), r10, &env, repo, id10, "visibility"));
TEST_CHECK_EQUAL(r10.count, 0u);
diff --git a/paludis/repositories/e/vdb_repository.cc b/paludis/repositories/e/vdb_repository.cc
index e4c006e..db585ea 100644
--- a/paludis/repositories/e/vdb_repository.cc
+++ b/paludis/repositories/e/vdb_repository.cc
@@ -915,7 +915,8 @@ VDBRepository::need_package_ids(const CategoryNamePart & c) const
if (std::string::npos == s.rfind('-'))
continue;
- PackageDepSpec p(parse_user_package_dep_spec("=" + stringify(c) + "/" + s, UserPackageDepSpecOptions()));
+ PackageDepSpec p(parse_user_package_dep_spec("=" + stringify(c) + "/" + s,
+ _imp->params.environment, UserPackageDepSpecOptions()));
q->insert(*p.package_ptr());
IDMap::iterator i(_imp->ids.find(*p.package_ptr()));
if (_imp->ids.end() == i)
diff --git a/paludis/repositories/e/vdb_repository_TEST.cc b/paludis/repositories/e/vdb_repository_TEST.cc
index 9f3f580..75c9aaa 100644
--- a/paludis/repositories/e/vdb_repository_TEST.cc
+++ b/paludis/repositories/e/vdb_repository_TEST.cc
@@ -129,7 +129,8 @@ namespace test_cases
env.package_database()->add_repository(1, repo);
std::tr1::shared_ptr<const PackageID> e1(*env[selection::RequireExactlyOne(generator::Matches(
- PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-1", UserPackageDepSpecOptions()))))]->begin());
+ PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-1",
+ &env, UserPackageDepSpecOptions()))))]->begin());
TEST_CHECK((*repo)[k::use_interface()]->query_use(UseFlagName("flag1"), *e1) == use_enabled);
TEST_CHECK((*repo)[k::use_interface()]->query_use(UseFlagName("flag2"), *e1) == use_enabled);
@@ -210,7 +211,8 @@ namespace test_cases
env.package_database()->add_repository(1, repo);
std::tr1::shared_ptr<const PackageID> e1(*env[selection::RequireExactlyOne(generator::Matches(
- PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-1", UserPackageDepSpecOptions()))))]->begin());
+ PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-1",
+ &env, UserPackageDepSpecOptions()))))]->begin());
ContentsGatherer gatherer;
std::for_each(indirect_iterator(e1->contents_key()->value()->begin()),
indirect_iterator(e1->contents_key()->value()->end()),
@@ -265,7 +267,7 @@ namespace test_cases
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("category/package",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
StringifyFormatter ff;
@@ -353,7 +355,7 @@ namespace test_cases
TestMessageSuffix suffix("install", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/target-" + eapi + "::srcrepo",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
TEST_CHECK(id);
id->perform_action(install_action);
}
@@ -364,7 +366,7 @@ namespace test_cases
TestMessageSuffix suffix("reinstall", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/target-" + eapi + "::srcrepo",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
TEST_CHECK(id);
id->perform_action(install_action);
}
@@ -375,7 +377,7 @@ namespace test_cases
TestMessageSuffix suffix("info", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/target-" + eapi + "::installed",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
TEST_CHECK(id);
id->perform_action(info_action);
}
@@ -384,7 +386,7 @@ namespace test_cases
TestMessageSuffix suffix("config", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/target-" + eapi + "::installed",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
TEST_CHECK(id);
id->perform_action(config_action);
}
@@ -393,7 +395,7 @@ namespace test_cases
TestMessageSuffix suffix("uninstall", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/target-" + eapi + "::installed",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
TEST_CHECK(id);
id->perform_action(uninstall_action);
}
@@ -468,7 +470,7 @@ namespace test_cases
TestMessageSuffix suffix("vars", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/target-" + eapi + "::srcrepo",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
TEST_CHECK(id);
id->perform_action(install_action);
}
@@ -479,7 +481,7 @@ namespace test_cases
TestMessageSuffix suffix("reinstall", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/target-" + eapi + "::srcrepo",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
TEST_CHECK(id);
id->perform_action(install_action);
}
@@ -490,7 +492,7 @@ namespace test_cases
TestMessageSuffix suffix("info", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/target-" + eapi + "::installed",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
TEST_CHECK(id);
id->perform_action(info_action);
}
@@ -499,7 +501,7 @@ namespace test_cases
TestMessageSuffix suffix("config", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/target-" + eapi + "::installed",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
TEST_CHECK(id);
id->perform_action(config_action);
}
@@ -508,7 +510,7 @@ namespace test_cases
TestMessageSuffix suffix("uninstall", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/target-" + eapi + "::installed",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
TEST_CHECK(id);
id->perform_action(uninstall_action);
}
@@ -586,7 +588,7 @@ namespace test_cases
TestMessageSuffix suffix("install", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg1-1::namesincrtest_src",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
id->perform_action(install_action);
vdb_repo->invalidate();
@@ -601,7 +603,7 @@ namespace test_cases
TestMessageSuffix suffix("reinstall", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg1-1::namesincrtest_src",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
id->perform_action(install_action);
vdb_repo->invalidate();
@@ -616,10 +618,10 @@ namespace test_cases
TestMessageSuffix suffix("upgrade", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg1-1.1::namesincrtest_src",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
const std::tr1::shared_ptr<const PackageID> inst_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg1-1::installed",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
id->perform_action(install_action);
vdb_repo->invalidate();
inst_id->perform_action(uninstall_action);
@@ -636,10 +638,10 @@ namespace test_cases
TestMessageSuffix suffix("downgrade", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg1-1::namesincrtest_src",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
const std::tr1::shared_ptr<const PackageID> inst_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg1-1.1::installed",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
id->perform_action(install_action);
vdb_repo->invalidate();
inst_id->perform_action(uninstall_action);
@@ -656,7 +658,7 @@ namespace test_cases
TestMessageSuffix suffix("new slot", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg1-2::namesincrtest_src",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
id->perform_action(install_action);
vdb_repo->invalidate();
@@ -671,7 +673,7 @@ namespace test_cases
TestMessageSuffix suffix("remove other slot", true);
const std::tr1::shared_ptr<const PackageID> inst_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg1-2::installed",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
inst_id->perform_action(uninstall_action);
vdb_repo->invalidate();
@@ -686,7 +688,7 @@ namespace test_cases
TestMessageSuffix suffix("new package", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg2-1::namesincrtest_src",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
id->perform_action(install_action);
vdb_repo->invalidate();
@@ -703,7 +705,7 @@ namespace test_cases
TestMessageSuffix suffix("remove other package", true);
const std::tr1::shared_ptr<const PackageID> inst_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg2-1::installed",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
inst_id->perform_action(uninstall_action);
vdb_repo->invalidate();
@@ -718,7 +720,7 @@ namespace test_cases
TestMessageSuffix suffix("new category", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat2/pkg1-1::namesincrtest_src",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
id->perform_action(install_action);
vdb_repo->invalidate();
@@ -733,7 +735,7 @@ namespace test_cases
TestMessageSuffix suffix("remove other category", true);
const std::tr1::shared_ptr<const PackageID> inst_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat2/pkg1-1::installed",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
inst_id->perform_action(uninstall_action);
vdb_repo->invalidate();
@@ -748,7 +750,7 @@ namespace test_cases
TestMessageSuffix suffix("uninstall", true);
const std::tr1::shared_ptr<const PackageID> inst_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg1-1::installed",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
inst_id->perform_action(uninstall_action);
vdb_repo->invalidate();
@@ -940,7 +942,7 @@ namespace test_cases
TestMessageSuffix suffix("install", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg1-1::providesincrtest_src1",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
id->perform_action(install_action);
vdb_repo->invalidate();
@@ -951,7 +953,7 @@ namespace test_cases
TestMessageSuffix suffix("reinstall", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg1-1::providesincrtest_src1",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
id->perform_action(install_action);
vdb_repo->invalidate();
@@ -962,10 +964,10 @@ namespace test_cases
TestMessageSuffix suffix("upgrade", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg1-1.1::providesincrtest_src1",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
const std::tr1::shared_ptr<const PackageID> inst_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg1-1::installed",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
id->perform_action(install_action);
vdb_repo->invalidate();
inst_id->perform_action(uninstall_action);
@@ -978,7 +980,7 @@ namespace test_cases
TestMessageSuffix suffix("reinstall equivalent", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg1-1.1::providesincrtest_src2",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
id->perform_action(install_action);
vdb_repo->invalidate();
@@ -989,10 +991,10 @@ namespace test_cases
TestMessageSuffix suffix("downgrade", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg1-1::providesincrtest_src1",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
const std::tr1::shared_ptr<const PackageID> inst_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg1-1.1::installed",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
id->perform_action(install_action);
vdb_repo->invalidate();
inst_id->perform_action(uninstall_action);
@@ -1005,7 +1007,7 @@ namespace test_cases
TestMessageSuffix suffix("reinstall different PROVIDE", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg1-1::providesincrtest_src2",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
id->perform_action(install_action);
vdb_repo->invalidate();
@@ -1016,7 +1018,7 @@ namespace test_cases
TestMessageSuffix suffix("new slot", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg1-2::providesincrtest_src1",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
id->perform_action(install_action);
vdb_repo->invalidate();
@@ -1027,7 +1029,7 @@ namespace test_cases
TestMessageSuffix suffix("remove other slot", true);
const std::tr1::shared_ptr<const PackageID> inst_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg1-2::installed",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
inst_id->perform_action(uninstall_action);
vdb_repo->invalidate();
@@ -1038,7 +1040,7 @@ namespace test_cases
TestMessageSuffix suffix("new package", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg2-1::providesincrtest_src1",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
id->perform_action(install_action);
vdb_repo->invalidate();
@@ -1049,7 +1051,7 @@ namespace test_cases
TestMessageSuffix suffix("remove other package", true);
const std::tr1::shared_ptr<const PackageID> inst_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg2-1::installed",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
inst_id->perform_action(uninstall_action);
vdb_repo->invalidate();
@@ -1060,7 +1062,7 @@ namespace test_cases
TestMessageSuffix suffix("uninstall", true);
const std::tr1::shared_ptr<const PackageID> inst_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg1-1::installed",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
inst_id->perform_action(uninstall_action);
vdb_repo->invalidate();
@@ -1149,7 +1151,7 @@ namespace test_cases
TestMessageSuffix suffix("install", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/pkg-1::reinstalltest_src1",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
id->perform_action(install_action);
vdb_repo->invalidate();
@@ -1161,7 +1163,7 @@ namespace test_cases
TestMessageSuffix suffix("reinstall", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/pkg-1::reinstalltest_src1",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
id->perform_action(install_action);
vdb_repo->invalidate();
@@ -1173,7 +1175,7 @@ namespace test_cases
TestMessageSuffix suffix("reinstall equivalent", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/pkg-1::reinstalltest_src2",
- UserPackageDepSpecOptions()))))]->begin());
+ &env, UserPackageDepSpecOptions()))))]->begin());
id->perform_action(install_action);
vdb_repo->invalidate();
diff --git a/paludis/repositories/unpackaged/dep_parser.cc b/paludis/repositories/unpackaged/dep_parser.cc
index 6676ea1..3818eda 100644
--- a/paludis/repositories/unpackaged/dep_parser.cc
+++ b/paludis/repositories/unpackaged/dep_parser.cc
@@ -30,7 +30,7 @@ using namespace paludis;
using namespace paludis::unpackaged_repositories;
std::tr1::shared_ptr<const DependencySpecTree::ConstItem>
-DepParser::parse(const std::string & s)
+DepParser::parse(const Environment * const env, const std::string & s)
{
Context context("When parsing '" + s + "':");
@@ -51,7 +51,7 @@ DepParser::parse(const std::string & s)
std::tr1::shared_ptr<TreeLeaf<DependencySpecTree, PackageDepSpec> > spec(
new TreeLeaf<DependencySpecTree, PackageDepSpec>(std::tr1::shared_ptr<PackageDepSpec>(
- new PackageDepSpec(parse_user_package_dep_spec(a, UserPackageDepSpecOptions())))));
+ new PackageDepSpec(parse_user_package_dep_spec(a, env, UserPackageDepSpecOptions())))));
result->add(spec);
}
diff --git a/paludis/repositories/unpackaged/dep_parser.hh b/paludis/repositories/unpackaged/dep_parser.hh
index 060812f..c65a1f7 100644
--- a/paludis/repositories/unpackaged/dep_parser.hh
+++ b/paludis/repositories/unpackaged/dep_parser.hh
@@ -22,6 +22,7 @@
#include <paludis/util/instantiation_policy.hh>
#include <paludis/dep_tree.hh>
+#include <paludis/environment-fwd.hh>
namespace paludis
{
@@ -31,7 +32,8 @@ namespace paludis
private InstantiationPolicy<DepParser, instantiation_method::NonInstantiableTag>
{
public:
- static std::tr1::shared_ptr<const DependencySpecTree::ConstItem> parse(const std::string &);
+ static std::tr1::shared_ptr<const DependencySpecTree::ConstItem> parse(
+ const Environment * const env, const std::string &);
};
}
}
diff --git a/paludis/repositories/unpackaged/dep_parser_TEST.cc b/paludis/repositories/unpackaged/dep_parser_TEST.cc
index b4792ba..bf7ccfe 100644
--- a/paludis/repositories/unpackaged/dep_parser_TEST.cc
+++ b/paludis/repositories/unpackaged/dep_parser_TEST.cc
@@ -38,7 +38,8 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<const DependencySpecTree::ConstItem> spec(DepParser::parse("cat/one , cat/two, cat/three\n"));
+ std::tr1::shared_ptr<const DependencySpecTree::ConstItem> spec(
+ DepParser::parse(&env, "cat/one , cat/two, cat/three\n"));
StringifyFormatter f;
DepPrinter p(&env, f, true);
spec->accept(p);
diff --git a/paludis/repositories/unpackaged/installed_id.cc b/paludis/repositories/unpackaged/installed_id.cc
index 04bcd06..39ceed6 100644
--- a/paludis/repositories/unpackaged/installed_id.cc
+++ b/paludis/repositories/unpackaged/installed_id.cc
@@ -201,7 +201,7 @@ namespace
if (! f)
throw FSError("Couldn't open '" + stringify(_f) + "' for read");
- _v = DepParser::parse(strip_trailing(
+ _v = DepParser::parse(_env, strip_trailing(
std::string((std::istreambuf_iterator<char>(f)), std::istreambuf_iterator<char>()), "\n"));
return _v;
}
diff --git a/paludis/repositories/unpackaged/installed_repository_TEST.cc b/paludis/repositories/unpackaged/installed_repository_TEST.cc
index b4171bc..58a4908 100644
--- a/paludis/repositories/unpackaged/installed_repository_TEST.cc
+++ b/paludis/repositories/unpackaged/installed_repository_TEST.cc
@@ -123,7 +123,8 @@ namespace test_cases
env.package_database()->add_repository(1, repo);
const std::tr1::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(
- generator::Matches(parse_user_package_dep_spec("cat-one/foo:0", UserPackageDepSpecOptions())))]->begin());
+ generator::Matches(parse_user_package_dep_spec("cat-one/foo:0",
+ &env, UserPackageDepSpecOptions())))]->begin());
TEST_CHECK_EQUAL(id1->version(), VersionSpec("1"));
TEST_CHECK_EQUAL(id1->slot(), SlotName("0"));
@@ -140,7 +141,8 @@ namespace test_cases
TEST_CHECK_EQUAL(d1.s.str(), "dir</fnord>");
const std::tr1::shared_ptr<const PackageID> id2(*env[selection::RequireExactlyOne(
- generator::Matches(parse_user_package_dep_spec("cat-one/foo:1", UserPackageDepSpecOptions())))]->begin());
+ generator::Matches(parse_user_package_dep_spec("cat-one/foo:1",
+ &env, UserPackageDepSpecOptions())))]->begin());
TEST_CHECK_EQUAL(id2->version(), VersionSpec("2"));
TEST_CHECK_EQUAL(id2->slot(), SlotName("1"));
@@ -175,12 +177,14 @@ namespace test_cases
env.package_database()->add_repository(1, repo);
const std::tr1::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(
- generator::Matches(parse_user_package_dep_spec("cat-one/foo:0", UserPackageDepSpecOptions())))]->begin());
+ generator::Matches(parse_user_package_dep_spec("cat-one/foo:0",
+ &env, UserPackageDepSpecOptions())))]->begin());
TEST_CHECK(! id1->masked());
const std::tr1::shared_ptr<const PackageID> id2(*env[selection::RequireExactlyOne(
- generator::Matches(parse_user_package_dep_spec("cat-one/foo:1", UserPackageDepSpecOptions())))]->begin());
+ generator::Matches(parse_user_package_dep_spec("cat-one/foo:1",
+ &env, UserPackageDepSpecOptions())))]->begin());
TEST_CHECK(! id2->masked());
}
@@ -210,7 +214,8 @@ namespace test_cases
TEST_CHECK(repo->some_ids_might_support_action(SupportsActionTest<InstalledAction>()));
const std::tr1::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(
- generator::Matches(parse_user_package_dep_spec("cat-one/foo:1", UserPackageDepSpecOptions())))]->begin());
+ generator::Matches(parse_user_package_dep_spec("cat-one/foo:1",
+ &env, UserPackageDepSpecOptions())))]->begin());
TEST_CHECK(! id1->supports_action(SupportsActionTest<InstallAction>()));
TEST_CHECK(! id1->supports_action(SupportsActionTest<ConfigAction>()));
@@ -298,7 +303,8 @@ namespace test_cases
TEST_CHECK(FSEntry("installed_repository_TEST_dir/repo3/indices/packages/foo/cat-one").is_symbolic_link());
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(
- generator::Matches(parse_user_package_dep_spec("cat-one/foo:fred", UserPackageDepSpecOptions())))]->begin());
+ generator::Matches(parse_user_package_dep_spec("cat-one/foo:fred",
+ &env, UserPackageDepSpecOptions())))]->begin());
UninstallAction action(UninstallActionOptions::named_create()
(k::no_config_protect(), false)
@@ -538,7 +544,8 @@ namespace test_cases
UninstallAction action(UninstallActionOptions::named_create()
(k::no_config_protect(), false));
(*env[selection::RequireExactlyOne(generator::Matches(
- parse_user_package_dep_spec("cat/pkg4a", UserPackageDepSpecOptions())))]->begin())->perform_action(action);
+ parse_user_package_dep_spec("cat/pkg4a",
+ &env, UserPackageDepSpecOptions())))]->begin())->perform_action(action);
TEST_CHECK(FSEntry("installed_repository_TEST_dir/root4/dir").is_directory());
TEST_CHECK(! FSEntry("installed_repository_TEST_dir/root4/dir/4a").is_regular_file());
@@ -578,7 +585,8 @@ namespace test_cases
UninstallAction action(UninstallActionOptions::named_create()
(k::no_config_protect(), false));
(*env[selection::RequireExactlyOne(generator::Matches(
- parse_user_package_dep_spec("cat/pkg4b", UserPackageDepSpecOptions())))]->begin())->perform_action(action);
+ parse_user_package_dep_spec("cat/pkg4b",
+ &env, UserPackageDepSpecOptions())))]->begin())->perform_action(action);
TEST_CHECK(! FSEntry("installed_repository_TEST_dir/root4/dir").is_directory());
diff --git a/paludis/repositories/unpackaged/unpackaged_key.cc b/paludis/repositories/unpackaged/unpackaged_key.cc
index 01df30e..8a8117e 100644
--- a/paludis/repositories/unpackaged/unpackaged_key.cc
+++ b/paludis/repositories/unpackaged/unpackaged_key.cc
@@ -39,7 +39,7 @@ namespace paludis
Implementation(const Environment * const e, const std::string & v,
const std::tr1::shared_ptr<const DependencyLabelSequence> & l) :
env(e),
- value(DepParser::parse(v)),
+ value(DepParser::parse(env, v)),
labels(l)
{
}
diff --git a/paludis/repositories/virtuals/virtuals_repository_TEST.cc b/paludis/repositories/virtuals/virtuals_repository_TEST.cc
index 44bdff6..3750bd4 100644
--- a/paludis/repositories/virtuals/virtuals_repository_TEST.cc
+++ b/paludis/repositories/virtuals/virtuals_repository_TEST.cc
@@ -62,7 +62,7 @@ namespace test_cases
repo->add_version("cat", "pkg", "1")->provide_key()->set_from_string("virtual/pkg");
repo->add_version("cat", "pkg", "2")->provide_key()->set_from_string("virtual/pkg");
repo->add_virtual_package(QualifiedPackageName("virtual/pkg"), make_shared_ptr(new PackageDepSpec(
- parse_user_package_dep_spec(">=cat/pkg-2", UserPackageDepSpecOptions()))));
+ parse_user_package_dep_spec(">=cat/pkg-2", &env, UserPackageDepSpecOptions()))));
TEST_CHECK(repo->virtual_packages());
TEST_CHECK_EQUAL(std::distance(repo->virtual_packages()->begin(), repo->virtual_packages()->end()), 1);
@@ -96,14 +96,14 @@ namespace test_cases
repo1->add_version("cat", "pkg", "1")->provide_key()->set_from_string("virtual/pkg");
repo1->add_version("cat", "pkg", "2")->provide_key()->set_from_string("virtual/pkg");
repo1->add_virtual_package(QualifiedPackageName("virtual/pkg"), make_shared_ptr(
- new PackageDepSpec(parse_user_package_dep_spec(">=cat/pkg-2", UserPackageDepSpecOptions()))));
+ new PackageDepSpec(parse_user_package_dep_spec(">=cat/pkg-2", &env, UserPackageDepSpecOptions()))));
repo1->add_virtual_package(QualifiedPackageName("virtual/foo"), make_shared_ptr(
- new PackageDepSpec(parse_user_package_dep_spec(">=cat/pkg-2", UserPackageDepSpecOptions()))));
+ new PackageDepSpec(parse_user_package_dep_spec(">=cat/pkg-2", &env, UserPackageDepSpecOptions()))));
repo2->add_virtual_package(QualifiedPackageName("virtual/pkg"), make_shared_ptr(new PackageDepSpec(
- parse_user_package_dep_spec(">=cat/pkg-2", UserPackageDepSpecOptions()))));
+ parse_user_package_dep_spec(">=cat/pkg-2", &env, UserPackageDepSpecOptions()))));
repo2->add_virtual_package(QualifiedPackageName("virtual/foo"), make_shared_ptr(new PackageDepSpec(
- parse_user_package_dep_spec("<=cat/pkg-1", UserPackageDepSpecOptions()))));
+ parse_user_package_dep_spec("<=cat/pkg-1", &env, UserPackageDepSpecOptions()))));
TEST_CHECK(virtuals->has_category_named(CategoryNamePart("virtual")));
TEST_CHECK(virtuals->has_package_named(QualifiedPackageName("virtual/pkg")));
@@ -134,11 +134,11 @@ namespace test_cases
repo1->add_version("virtual", "gkp", "1")->provide_key()->set_from_string("virtual/pkg");
repo1->add_virtual_package(QualifiedPackageName("virtual/pkg"), make_shared_ptr(
- new PackageDepSpec(parse_user_package_dep_spec("virtual/gkp", UserPackageDepSpecOptions()))));
+ new PackageDepSpec(parse_user_package_dep_spec("virtual/gkp", &env, UserPackageDepSpecOptions()))));
repo2->add_version("virtual", "pkg", "2")->provide_key()->set_from_string("virtual/pkg");
repo2->add_virtual_package(QualifiedPackageName("virtual/pkg"), make_shared_ptr(new PackageDepSpec(
- parse_user_package_dep_spec("virtual/pkg", UserPackageDepSpecOptions()))));
+ parse_user_package_dep_spec("virtual/pkg", &env, UserPackageDepSpecOptions()))));
TEST_CHECK(virtuals->has_category_named(CategoryNamePart("virtual")));
TEST_CHECK(virtuals->has_package_named(QualifiedPackageName("virtual/pkg")));