aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-08-27 15:07:27 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-08-27 15:07:27 +0100
commitc991b6c714d53f02bb5152d441ae2af936041560 (patch)
tree0f2959e1a9ac58de198a85b70f03695e883e0a15
parent899b4eb439a9defd9b65444c00662ebb943dfd49 (diff)
downloadpaludis-c991b6c714d53f02bb5152d441ae2af936041560.tar.gz
paludis-c991b6c714d53f02bb5152d441ae2af936041560.tar.xz
Don't fetch_extra if we're ignoring unfetched
-rw-r--r--paludis/repositories/e/ebuild_entries.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/paludis/repositories/e/ebuild_entries.cc b/paludis/repositories/e/ebuild_entries.cc
index 8a034de..ec57a49 100644
--- a/paludis/repositories/e/ebuild_entries.cc
+++ b/paludis/repositories/e/ebuild_entries.cc
@@ -458,7 +458,8 @@ EbuildEntries::fetch(const std::tr1::shared_ptr<const ERepositoryID> & id,
id->fetches_key()->value()->root()->accept(c);
}
- if ((c.need_nofetch()) || (! id->eapi()->supported()->ebuild_phases()->ebuild_fetch_extra().empty()))
+ if ((c.need_nofetch()) ||
+ ((! fetch_action.options.ignore_unfetched()) && (! id->eapi()->supported()->ebuild_phases()->ebuild_fetch_extra().empty())))
{
bool userpriv_ok((! userpriv_restrict) && (_imp->environment->reduced_gid() != getgid()) &&
check_userpriv(FSEntry(_imp->params.builddir()), _imp->environment,
@@ -470,7 +471,7 @@ EbuildEntries::fetch(const std::tr1::shared_ptr<const ERepositoryID> & id,
std::tr1::shared_ptr<const FSEntrySequence> exlibsdirs(_imp->e_repository->layout()->exlibsdirs(id->name()));
EAPIPhases fetch_extra_phases(id->eapi()->supported()->ebuild_phases()->ebuild_fetch_extra());
- if (fetch_extra_phases.begin_phases() != fetch_extra_phases.end_phases())
+ if ((! fetch_action.options.ignore_unfetched()) && (fetch_extra_phases.begin_phases() != fetch_extra_phases.end_phases()))
{
for (EAPIPhases::ConstIterator phase(fetch_extra_phases.begin_phases()), phase_end(fetch_extra_phases.end_phases()) ;
phase != phase_end ; ++phase)