aboutsummaryrefslogtreecommitdiff
path: root/paludis/partially_made_package_dep_spec.cc
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-03-29 12:01:02 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-04 08:32:59 +0100
commit7d346bba37dfe95c858fa727bbc63bbc42074f30 (patch)
treec1cfaffcbe3f9bfd1b41ddef24d26372a8a2fb4b /paludis/partially_made_package_dep_spec.cc
parent5574c81a3c60266d023d18dfc115803da8b12e6b (diff)
downloadpaludis-7d346bba37dfe95c858fa727bbc63bbc42074f30.tar.gz
paludis-7d346bba37dfe95c858fa727bbc63bbc42074f30.tar.xz
in repository to requirements
Diffstat (limited to 'paludis/partially_made_package_dep_spec.cc')
-rw-r--r--paludis/partially_made_package_dep_spec.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/paludis/partially_made_package_dep_spec.cc b/paludis/partially_made_package_dep_spec.cc
index 98eca7ca9..018308811 100644
--- a/paludis/partially_made_package_dep_spec.cc
+++ b/paludis/partially_made_package_dep_spec.cc
@@ -54,7 +54,7 @@ namespace
std::shared_ptr<VersionRequirements> version_requirements;
VersionRequirementsMode version_requirements_mode_v;
std::shared_ptr<const SlotRequirement> slot;
- std::shared_ptr<const RepositoryName> in_repository;
+ std::shared_ptr<const InRepositoryConstraint> in_repository;
std::shared_ptr<const RepositoryName> from_repository;
std::shared_ptr<const InstallableToRepository> installable_to_repository;
std::shared_ptr<const FSPath> installed_at_path;
@@ -77,7 +77,7 @@ namespace
version_requirements(other.version_requirements_ptr() ? new VersionRequirements : 0),
version_requirements_mode_v(other.version_requirements_mode()),
slot(other.slot_requirement_ptr()),
- in_repository(other.in_repository_ptr()),
+ in_repository(other.in_repository_constraint()),
from_repository(other.from_repository_ptr()),
installable_to_repository(other.installable_to_repository_ptr()),
installed_at_path(other.installed_at_path_ptr()),
@@ -171,8 +171,8 @@ namespace
if (from_repository_ptr())
left = stringify(*from_repository_ptr());
- if (in_repository_ptr())
- right = stringify(*in_repository_ptr());
+ if (in_repository_constraint())
+ right = stringify(in_repository_constraint()->name());
if (installed_at_path_ptr())
{
@@ -308,7 +308,7 @@ namespace
return slot;
}
- virtual std::shared_ptr<const RepositoryName> in_repository_ptr() const
+ virtual const std::shared_ptr<const InRepositoryConstraint> in_repository_constraint() const
{
return in_repository;
}
@@ -419,7 +419,7 @@ PartiallyMadePackageDepSpec::clear_slot_requirement()
PartiallyMadePackageDepSpec &
PartiallyMadePackageDepSpec::in_repository(const RepositoryName & s)
{
- _imp->data->in_repository = std::make_shared<RepositoryName>(s);
+ _imp->data->in_repository = InRepositoryConstraintPool::get_instance()->create(s);
return *this;
}