aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/gemcutter/gemcutter_id.cc
diff options
context:
space:
mode:
Diffstat (limited to 'paludis/repositories/gemcutter/gemcutter_id.cc')
-rw-r--r--paludis/repositories/gemcutter/gemcutter_id.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/paludis/repositories/gemcutter/gemcutter_id.cc b/paludis/repositories/gemcutter/gemcutter_id.cc
index 85a7bd6cc..1d70f81de 100644
--- a/paludis/repositories/gemcutter/gemcutter_id.cc
+++ b/paludis/repositories/gemcutter/gemcutter_id.cc
@@ -125,7 +125,7 @@ namespace paludis
const Environment * const env;
const QualifiedPackageName name;
const VersionSpec version;
- const GemcutterRepository * const repo;
+ const RepositoryName repository_name;
std::shared_ptr<LiteralMetadataValueKey<SlotName> > slot_key;
std::shared_ptr<LiteralMetadataValueKey<std::string> > authors_key;
@@ -143,7 +143,7 @@ namespace paludis
env(e.environment()),
name(CategoryNamePart("gem"), PackageNamePart(e.info().name())),
version(e.info().version(), { }),
- repo(e.repository()),
+ repository_name(e.repository()),
slot_key(std::make_shared<LiteralMetadataValueKey<SlotName> >("slot", "Slot", mkt_internal, SlotName(e.info().version()))),
authors_key(make_string_key("authors", "Authors", mkt_author, e.info().authors())),
info_key(make_string_key("info", "Info", mkt_significant, e.info().info())),
@@ -244,16 +244,16 @@ GemcutterID::canonical_form(const PackageIDCanonicalForm f) const
{
case idcf_full:
return stringify(_imp->name) + "-" + stringify(_imp->version) +
- "::" + stringify(_imp->repo->name());
+ "::" + stringify(_imp->repository_name);
case idcf_no_version:
- return stringify(_imp->name) + "::" + stringify(_imp->repo->name());
+ return stringify(_imp->name) + "::" + stringify(_imp->repository_name);
case idcf_version:
return stringify(_imp->version);
case idcf_no_name:
- return stringify(_imp->version) + "::" + stringify(_imp->repo->name());
+ return stringify(_imp->version) + "::" + stringify(_imp->repository_name);
case last_idcf:
break;
@@ -266,7 +266,7 @@ PackageDepSpec
GemcutterID::uniquely_identifying_spec() const
{
return parse_user_package_dep_spec("=" + stringify(name()) + "-" + stringify(version()) +
- + "::" + stringify(repository()->name()),
+ + "::" + stringify(repository_name()),
_imp->env, { });
}
@@ -282,10 +282,10 @@ GemcutterID::version() const
return _imp->version;
}
-const std::shared_ptr<const Repository>
-GemcutterID::repository() const
+const RepositoryName
+GemcutterID::repository_name() const
{
- return _imp->repo->shared_from_this();
+ return _imp->repository_name;
}
bool