aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e/e_repository_sets.cc
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-02 15:14:21 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-04 08:32:59 +0100
commit1a8319191a0c4a585fab173199a2c898c76f30c3 (patch)
tree39ae0ee349e25f0b420fbd72cc43bd4ba3007d8d /paludis/repositories/e/e_repository_sets.cc
parentf243a4014b98275a3ebb7872faadab5ba1fcafa8 (diff)
downloadpaludis-1a8319191a0c4a585fab173199a2c898c76f30c3.tar.gz
paludis-1a8319191a0c4a585fab173199a2c898c76f30c3.tar.xz
Version requirements to constraints
Diffstat (limited to 'paludis/repositories/e/e_repository_sets.cc')
-rw-r--r--paludis/repositories/e/e_repository_sets.cc9
1 files changed, 2 insertions, 7 deletions
diff --git a/paludis/repositories/e/e_repository_sets.cc b/paludis/repositories/e/e_repository_sets.cc
index d9f15fe01..2f5736042 100644
--- a/paludis/repositories/e/e_repository_sets.cc
+++ b/paludis/repositories/e/e_repository_sets.cc
@@ -37,7 +37,6 @@
#include <paludis/set_file.hh>
#include <paludis/user_dep_spec.hh>
#include <paludis/version_operator.hh>
-#include <paludis/version_requirements.hh>
#include <paludis/util/config_file.hh>
#include <paludis/util/is_file_with_extension.hh>
@@ -296,9 +295,7 @@ ERepositorySets::security_set(bool insecurity) const
std::shared_ptr<PackageDepSpec> spec(std::make_shared<PackageDepSpec>(
make_package_dep_spec({ })
.package((*c)->name())
- .version_requirement(make_named_values<VersionRequirement>(
- n::version_operator() = vo_equal,
- n::version_spec() = (*c)->version()))
+ .version_constraint((*c)->version(), vo_equal, vcc_and)
.in_repository((*c)->repository_name())));
security_packages->top()->append(spec);
}
@@ -328,9 +325,7 @@ ERepositorySets::security_set(bool insecurity) const
std::shared_ptr<PackageDepSpec> spec(std::make_shared<PackageDepSpec>(make_package_dep_spec({ })
.package((*r)->name())
- .version_requirement(make_named_values<VersionRequirement>(
- n::version_operator() = vo_equal,
- n::version_spec() = (*r)->version()))
+ .version_constraint((*r)->version(), vo_equal, vcc_and)
.in_repository((*r)->repository_name())));
security_packages->top()->append(spec);
ok = true;