aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-07 14:15:31 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-07 14:15:31 +0100
commit5bca2928c8047c1d34e35d8c167a7a6644b2515a (patch)
treef89de8dc9aac885067abea62dc1f5e8fcb04eea9 /paludis/repositories
parent4eb9754117cf6d1fe9985fc1950ffbaf943fcafc (diff)
downloadpaludis-5bca2928c8047c1d34e35d8c167a7a6644b2515a.tar.gz
paludis-5bca2928c8047c1d34e35d8c167a7a6644b2515a.tar.xz
Constraint -> Requirement
Diffstat (limited to 'paludis/repositories')
-rw-r--r--paludis/repositories/accounts/accounts_dep_key.cc2
-rw-r--r--paludis/repositories/e/e_repository_sets.cc12
-rw-r--r--paludis/repositories/e/exheres_mask_store.cc6
-rw-r--r--paludis/repositories/e/fix_locked_dependencies.cc8
-rw-r--r--paludis/repositories/e/traditional_mask_store.cc6
-rw-r--r--paludis/repositories/e/traditional_profile.cc6
-rw-r--r--paludis/repositories/e/vdb_repository.cc24
-rw-r--r--paludis/repositories/gemcutter/gemcutter_dependencies_key.cc4
-rw-r--r--paludis/repositories/virtuals/package_id.cc10
-rw-r--r--paludis/repositories/virtuals/virtuals_repository.cc2
10 files changed, 40 insertions, 40 deletions
diff --git a/paludis/repositories/accounts/accounts_dep_key.cc b/paludis/repositories/accounts/accounts_dep_key.cc
index 0d08a66b0..633768286 100644
--- a/paludis/repositories/accounts/accounts_dep_key.cc
+++ b/paludis/repositories/accounts/accounts_dep_key.cc
@@ -76,7 +76,7 @@ namespace paludis
{
std::shared_ptr<PackageDepSpec> spec(std::make_shared<PackageDepSpec>(
MutablePackageDepSpecData({ })
- .constrain_package(CategoryNamePart("group") + PackageNamePart(*i))));
+ .require_package(CategoryNamePart("group") + PackageNamePart(*i))));
specs->push_back(spec);
tree->top()->append(spec);
}
diff --git a/paludis/repositories/e/e_repository_sets.cc b/paludis/repositories/e/e_repository_sets.cc
index 83e179c31..bae7c8022 100644
--- a/paludis/repositories/e/e_repository_sets.cc
+++ b/paludis/repositories/e/e_repository_sets.cc
@@ -294,9 +294,9 @@ ERepositorySets::security_set(bool insecurity) const
{
std::shared_ptr<PackageDepSpec> spec(std::make_shared<PackageDepSpec>(
MutablePackageDepSpecData({ })
- .constrain_package((*c)->name())
- .constrain_version(vcc_and, vo_equal, (*c)->version())
- .constrain_in_repository((*c)->repository_name())));
+ .require_package((*c)->name())
+ .require_version(vrc_and, vo_equal, (*c)->version())
+ .require_in_repository((*c)->repository_name())));
security_packages->top()->append(spec);
}
else
@@ -324,9 +324,9 @@ ERepositorySets::security_set(bool insecurity) const
}
std::shared_ptr<PackageDepSpec> spec(std::make_shared<PackageDepSpec>(MutablePackageDepSpecData({ })
- .constrain_package((*r)->name())
- .constrain_version(vcc_and, vo_equal, (*r)->version())
- .constrain_in_repository((*r)->repository_name())));
+ .require_package((*r)->name())
+ .require_version(vrc_and, vo_equal, (*r)->version())
+ .require_in_repository((*r)->repository_name())));
security_packages->top()->append(spec);
ok = true;
break;
diff --git a/paludis/repositories/e/exheres_mask_store.cc b/paludis/repositories/e/exheres_mask_store.cc
index 5b5a0e16b..b6c6fd7ed 100644
--- a/paludis/repositories/e/exheres_mask_store.cc
+++ b/paludis/repositories/e/exheres_mask_store.cc
@@ -37,7 +37,7 @@
#include <paludis/match_package.hh>
#include <paludis/dep_spec_flattener.hh>
#include <paludis/dep_spec_annotations.hh>
-#include <paludis/package_dep_spec_constraint.hh>
+#include <paludis/package_dep_spec_requirement.hh>
#include <algorithm>
#include <unordered_map>
@@ -165,8 +165,8 @@ ExheresMaskStore::_populate()
for (auto s(flat_specs.begin()), s_end(flat_specs.end()) ;
s != s_end ; ++s)
{
- if ((*s)->package_name_constraint())
- _imp->repo_mask[(*s)->package_name_constraint()->name()].push_back(std::make_pair(**s, make_mask_info(**s, *f)));
+ if ((*s)->package_name_requirement())
+ _imp->repo_mask[(*s)->package_name_requirement()->name()].push_back(std::make_pair(**s, make_mask_info(**s, *f)));
else
Log::get_instance()->message("e.package_mask.bad_spec", ll_warning, lc_context)
<< "Loading package mask spec '" << **s << "' failed because specification does not restrict to a "
diff --git a/paludis/repositories/e/fix_locked_dependencies.cc b/paludis/repositories/e/fix_locked_dependencies.cc
index db1864d6a..8f1a90f0d 100644
--- a/paludis/repositories/e/fix_locked_dependencies.cc
+++ b/paludis/repositories/e/fix_locked_dependencies.cc
@@ -35,7 +35,7 @@
#include <paludis/filter.hh>
#include <paludis/filtered_generator.hh>
#include <paludis/metadata_key.hh>
-#include <paludis/package_dep_spec_constraint.hh>
+#include <paludis/package_dep_spec_requirement.hh>
#include <paludis/dep_spec_data.hh>
#include <functional>
@@ -102,7 +102,7 @@ namespace
do
{
- if ((! node.spec()->any_slot_constraint()) || (! node.spec()->any_slot_constraint()->locking()))
+ if ((! node.spec()->any_slot_requirement()) || (! node.spec()->any_slot_requirement()->locking()))
break;
std::shared_ptr<const PackageIDSequence> matches((*env)[selection::AllVersionsSorted(
@@ -113,8 +113,8 @@ namespace
if ((*matches->last())->slot_key())
{
PackageDepSpec new_s(MutablePackageDepSpecData(*node.spec()->data())
- .unconstrain_any_slot()
- .constrain_exact_slot((*matches->last())->slot_key()->value(), true));
+ .unrequire_any_slot()
+ .require_exact_slot((*matches->last())->slot_key()->value(), true));
c = std::make_shared<PackageDepSpec>(new_s);
}
} while (false);
diff --git a/paludis/repositories/e/traditional_mask_store.cc b/paludis/repositories/e/traditional_mask_store.cc
index f969ab332..4c969ff14 100644
--- a/paludis/repositories/e/traditional_mask_store.cc
+++ b/paludis/repositories/e/traditional_mask_store.cc
@@ -32,7 +32,7 @@
#include <paludis/dep_spec.hh>
#include <paludis/package_id.hh>
#include <paludis/match_package.hh>
-#include <paludis/package_dep_spec_constraint.hh>
+#include <paludis/package_dep_spec_requirement.hh>
#include <algorithm>
#include <unordered_map>
@@ -101,8 +101,8 @@ TraditionalMaskStore::_populate()
auto a(parse_elike_package_dep_spec(
line->second.first, line->first->supported()->package_dep_spec_parse_options(),
line->first->supported()->version_spec_options()));
- if (a.package_name_constraint())
- _imp->repo_mask[a.package_name_constraint()->name()].push_back(std::make_pair(a, line->second.second));
+ if (a.package_name_requirement())
+ _imp->repo_mask[a.package_name_requirement()->name()].push_back(std::make_pair(a, line->second.second));
else
Log::get_instance()->message("e.package_mask.bad_spec", ll_warning, lc_context)
<< "Loading package mask spec '" << line->second.first << "' failed because specification does not restrict to a "
diff --git a/paludis/repositories/e/traditional_profile.cc b/paludis/repositories/e/traditional_profile.cc
index 50a26c8cb..ef501e033 100644
--- a/paludis/repositories/e/traditional_profile.cc
+++ b/paludis/repositories/e/traditional_profile.cc
@@ -51,7 +51,7 @@
#include <paludis/distribution.hh>
#include <paludis/package_id.hh>
#include <paludis/metadata_key.hh>
-#include <paludis/package_dep_spec_constraint.hh>
+#include <paludis/package_dep_spec_requirement.hh>
#include <unordered_map>
#include <unordered_set>
@@ -361,8 +361,8 @@ namespace
line->first->supported()->package_dep_spec_parse_options(),
line->first->supported()->version_spec_options())));
- if (a->package_name_constraint())
- _imp->package_mask[a->package_name_constraint()->name()].push_back(std::make_pair(a, line->second.second));
+ if (a->package_name_requirement())
+ _imp->package_mask[a->package_name_requirement()->name()].push_back(std::make_pair(a, line->second.second));
else
Log::get_instance()->message("e.profile.package_mask.bad_spec", ll_warning, lc_context)
<< "Loading package.mask spec '" << line->second.first << "' failed because specification does not restrict to a "
diff --git a/paludis/repositories/e/vdb_repository.cc b/paludis/repositories/e/vdb_repository.cc
index a9515c4d9..99209e148 100644
--- a/paludis/repositories/e/vdb_repository.cc
+++ b/paludis/repositories/e/vdb_repository.cc
@@ -52,7 +52,7 @@
#include <paludis/output_manager.hh>
#include <paludis/dep_spec_annotations.hh>
#include <paludis/unformatted_pretty_printer.hh>
-#include <paludis/package_dep_spec_constraint.hh>
+#include <paludis/package_dep_spec_requirement.hh>
#include <paludis/dep_spec_data.hh>
#include <paludis/util/accept_visitor.hh>
@@ -1106,15 +1106,15 @@ VDBRepository::need_package_ids(const CategoryNamePart & c) const
continue;
PackageDepSpec p(parse_user_package_dep_spec("=" + stringify(c) + "/" + s, _imp->params.environment(), { }));
- q->insert(p.package_name_constraint()->name());
- IDMap::iterator i(_imp->ids.find(p.package_name_constraint()->name()));
+ q->insert(p.package_name_requirement()->name());
+ IDMap::iterator i(_imp->ids.find(p.package_name_requirement()->name()));
if (_imp->ids.end() == i)
- i = _imp->ids.insert(std::make_pair(p.package_name_constraint()->name(), std::make_shared<PackageIDSequence>())).first;
+ i = _imp->ids.insert(std::make_pair(p.package_name_requirement()->name(), std::make_shared<PackageIDSequence>())).first;
- if ((! bool(p.all_version_constraints())) || (std::distance(p.all_version_constraints()->begin(), p.all_version_constraints()->end()) != 1))
- throw InternalError(PALUDIS_HERE, "didn't get a single version constraint");
+ if ((! bool(p.all_version_requirements())) || (std::distance(p.all_version_requirements()->begin(), p.all_version_requirements()->end()) != 1))
+ throw InternalError(PALUDIS_HERE, "didn't get a single version requirement");
- i->second->push_back(make_id(p.package_name_constraint()->name(), (*p.all_version_constraints()->begin())->version_spec(), *d));
+ i->second->push_back(make_id(p.package_name_requirement()->name(), (*p.all_version_requirements()->begin())->version_spec(), *d));
}
catch (const InternalError &)
{
@@ -1272,12 +1272,12 @@ namespace
void visit(const DependencySpecTree::NodeType<PackageDepSpec>::Type & node)
{
- if (node.spec()->package_name_constraint() && rewrites.end() != rewrites.find(node.spec()->package_name_constraint()->name()))
+ if (node.spec()->package_name_requirement() && rewrites.end() != rewrites.find(node.spec()->package_name_requirement()->name()))
{
changed = true;
str << f.prettify(MutablePackageDepSpecData(*node.spec()->data())
- .unconstrain_package()
- .constrain_package(rewrites.find(node.spec()->package_name_constraint()->name())->second)) << " ";
+ .unrequire_package()
+ .require_package(rewrites.find(node.spec()->package_name_requirement()->name())->second)) << " ";
}
else
str << f.prettify(*node.spec()) << " ";
@@ -1615,8 +1615,8 @@ VDBRepository::perform_updates()
i != i_end ; ++i)
_imp->params.environment()->update_config_files_for_package_move(
MutablePackageDepSpecData({ })
- .unconstrain_package()
- .constrain_package(i->first),
+ .unrequire_package()
+ .require_package(i->first),
i->second
);
}
diff --git a/paludis/repositories/gemcutter/gemcutter_dependencies_key.cc b/paludis/repositories/gemcutter/gemcutter_dependencies_key.cc
index 757f4ab15..deccd1357 100644
--- a/paludis/repositories/gemcutter/gemcutter_dependencies_key.cc
+++ b/paludis/repositories/gemcutter/gemcutter_dependencies_key.cc
@@ -176,8 +176,8 @@ namespace
VersionSpec ver(tokens[1], { });
return make_shared_copy(PackageDepSpec(MutablePackageDepSpecData({ pdsdo_always_use_ranged_deps })
- .constrain_package(QualifiedPackageName("gem/" + dep.name()))
- .constrain_version(vcc_and, op, ver)
+ .require_package(QualifiedPackageName("gem/" + dep.name()))
+ .require_version(vrc_and, op, ver)
));
}
diff --git a/paludis/repositories/virtuals/package_id.cc b/paludis/repositories/virtuals/package_id.cc
index f59ce46c6..f90a77995 100644
--- a/paludis/repositories/virtuals/package_id.cc
+++ b/paludis/repositories/virtuals/package_id.cc
@@ -73,14 +73,14 @@ namespace paludis
spec(exact ?
std::make_shared<PackageDepSpec>(
MutablePackageDepSpecData({ })
- .constrain_package(v->name())
- .constrain_version(vcc_and, vo_equal, v->version())
- .constrain_exact_slot(v->slot_key() ? v->slot_key()->value() : SlotName("UNKNOWN"), false)
- .constrain_in_repository(v->repository_name()))
+ .require_package(v->name())
+ .require_version(vrc_and, vo_equal, v->version())
+ .require_exact_slot(v->slot_key() ? v->slot_key()->value() : SlotName("UNKNOWN"), false)
+ .require_in_repository(v->repository_name()))
:
std::make_shared<PackageDepSpec>(
MutablePackageDepSpecData({ })
- .constrain_package(v->name())
+ .require_package(v->name())
)
),
raw_name(r),
diff --git a/paludis/repositories/virtuals/virtuals_repository.cc b/paludis/repositories/virtuals/virtuals_repository.cc
index 62288eaac..6448be6ef 100644
--- a/paludis/repositories/virtuals/virtuals_repository.cc
+++ b/paludis/repositories/virtuals/virtuals_repository.cc
@@ -160,7 +160,7 @@ VirtualsRepository::need_names() const
for (RepositoryProvidesInterface::ProvidesSequence::ConstIterator p(provides->begin()),
p_end(provides->end()) ; p != p_end ; ++p)
_imp->names.push_back(std::make_pair((*p).virtual_name(), std::shared_ptr<const PackageDepSpec>(
- std::make_shared<PackageDepSpec>(MutablePackageDepSpecData({ }).constrain_package((*p).provided_by()->name())))));
+ std::make_shared<PackageDepSpec>(MutablePackageDepSpecData({ }).require_package((*p).provided_by()->name())))));
}
std::sort(_imp->names.begin(), _imp->names.end(), NamesSortComparator());