aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-03-07 12:21:27 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-03-07 12:21:27 +0000
commit0ba6a2c2db1edbb785f493d2314b11084c8da858 (patch)
treec8d4be73e65113de56a20f63f969b86f5c1fcfc4
parent333bb718dbc63b2a335348300e20510229dcfd11 (diff)
downloadpaludis-0ba6a2c2db1edbb785f493d2314b11084c8da858.tar.gz
paludis-0ba6a2c2db1edbb785f493d2314b11084c8da858.tar.xz
Look in the right place for profiles
Fixes: ticket:815
-rw-r--r--paludis/repositories/e/e_repository.cc11
1 files changed, 2 insertions, 9 deletions
diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc
index 2a3a724..fc11f48 100644
--- a/paludis/repositories/e/e_repository.cc
+++ b/paludis/repositories/e/e_repository.cc
@@ -418,7 +418,7 @@ namespace paludis
if (tokens.size() < 3)
continue;
- FSEntry p(params.location() / "profiles" / tokens.at(1));
+ FSEntry p(profiles_desc.dirname().realpath() / tokens.at(1));
auto_profiles->push_back(p);
main_profile_path.reset(new FSEntry(p));
break;
@@ -1277,14 +1277,7 @@ ERepository::repository_factory_create(
}
}
else if (f("profiles") == "(auto)")
- {
- profiles.reset(new FSEntrySequence);
- if (master_repositories)
- std::copy((*master_repositories->begin())->params().profiles()->begin(),
- (*master_repositories->begin())->params().profiles()->end(), profiles->back_inserter());
- else
- auto_profiles = true;
- }
+ auto_profiles = true;
else
profiles_explicitly_set = true;