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 13:23:41 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-04 08:32:59 +0100
commitbc262ad74eb8d80eb979a5c5591b222d5fc1eb36 (patch)
tree6da646abbdea2c1948347abe2679fa1f79be1d15 /paludis/partially_made_package_dep_spec.cc
parent63ca918976505d042587bf7591dfce41b206b8cc (diff)
downloadpaludis-bc262ad74eb8d80eb979a5c5591b222d5fc1eb36.tar.gz
paludis-bc262ad74eb8d80eb979a5c5591b222d5fc1eb36.tar.xz
installed at path 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 9f4e7f764..5454f00c3 100644
--- a/paludis/partially_made_package_dep_spec.cc
+++ b/paludis/partially_made_package_dep_spec.cc
@@ -57,7 +57,7 @@ namespace
std::shared_ptr<const InRepositoryConstraint> in_repository;
std::shared_ptr<const FromRepositoryConstraint> from_repository;
std::shared_ptr<const InstallableToRepository> installable_to_repository;
- std::shared_ptr<const FSPath> installed_at_path;
+ std::shared_ptr<const InstalledAtPathConstraint> installed_at_path;
std::shared_ptr<const InstallableToPath> installable_to_path;
std::shared_ptr<AdditionalPackageDepSpecRequirements> additional_requirements;
PartiallyMadePackageDepSpecOptions options_for_partially_made_package_dep_spec_v;
@@ -80,7 +80,7 @@ namespace
in_repository(other.in_repository_constraint()),
from_repository(other.from_repository_constraint()),
installable_to_repository(other.installable_to_repository_ptr()),
- installed_at_path(other.installed_at_path_ptr()),
+ installed_at_path(other.installed_at_path_constraint()),
installable_to_path(other.installable_to_path_ptr()),
additional_requirements(other.additional_requirements_ptr() ? new AdditionalPackageDepSpecRequirements : 0),
options_for_partially_made_package_dep_spec_v(other.options_for_partially_made_package_dep_spec())
@@ -174,14 +174,14 @@ namespace
if (in_repository_constraint())
right = stringify(in_repository_constraint()->name());
- if (installed_at_path_ptr())
+ if (installed_at_path_constraint())
{
if (! right.empty())
{
need_arrow = true;
right.append("->");
}
- right.append(stringify(*installed_at_path_ptr()));
+ right.append(stringify(installed_at_path_constraint()->path()));
}
if (installable_to_repository_ptr())
@@ -323,7 +323,7 @@ namespace
return from_repository;
}
- virtual std::shared_ptr<const FSPath> installed_at_path_ptr() const
+ virtual const std::shared_ptr<const InstalledAtPathConstraint> installed_at_path_constraint() const
{
return installed_at_path;
}
@@ -461,7 +461,7 @@ PartiallyMadePackageDepSpec::clear_installable_to_repository()
PartiallyMadePackageDepSpec &
PartiallyMadePackageDepSpec::installed_at_path(const FSPath & s)
{
- _imp->data->installed_at_path = std::make_shared<FSPath>(s);
+ _imp->data->installed_at_path = InstalledAtPathConstraintPool::get_instance()->create(s);
return *this;
}