aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-07-25 20:51:11 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-07-25 20:51:11 +0000
commitcad081cae08aa4e2bca13e141e5a200df007ebc4 (patch)
tree0e7b2855679e5710683fb7159b2c6fa564ac3bed
parent22907f3d2928f97b7e70eb9f383acf81d30add5c (diff)
downloadpaludis-cad081cae08aa4e2bca13e141e5a200df007ebc4.tar.gz
paludis-cad081cae08aa4e2bca13e141e5a200df007ebc4.tar.xz
Fix master repository profile locations. Fixes: ticket:293
-rw-r--r--paludis/repositories/e/exheres_layout.cc5
-rw-r--r--paludis/repositories/e/traditional_layout.cc5
2 files changed, 8 insertions, 2 deletions
diff --git a/paludis/repositories/e/exheres_layout.cc b/paludis/repositories/e/exheres_layout.cc
index 037a5a9..7235818 100644
--- a/paludis/repositories/e/exheres_layout.cc
+++ b/paludis/repositories/e/exheres_layout.cc
@@ -441,7 +441,10 @@ ExheresLayout::package_file(const PackageID & id) const
FSEntry
ExheresLayout::profiles_base_dir() const
{
- return _imp->tree_root / "profiles";
+ if (master_repository_location())
+ return *master_repository_location() / "profiles";
+ else
+ return _imp->tree_root / "profiles";
}
tr1::shared_ptr<const FSEntrySequence>
diff --git a/paludis/repositories/e/traditional_layout.cc b/paludis/repositories/e/traditional_layout.cc
index 3bfa77c..68e126d 100644
--- a/paludis/repositories/e/traditional_layout.cc
+++ b/paludis/repositories/e/traditional_layout.cc
@@ -460,7 +460,10 @@ TraditionalLayout::package_file(const PackageID & id) const
FSEntry
TraditionalLayout::profiles_base_dir() const
{
- return _imp->tree_root / "profiles";
+ if (master_repository_location())
+ return *master_repository_location() / "profiles";
+ else
+ return _imp->tree_root / "profiles";
}
tr1::shared_ptr<const FSEntrySequence>