aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-03-30 05:00:21 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-03-30 05:00:21 +0000
commitb970f1a6fd29a3f58b7ce030bd128e6e9c20aaae (patch)
treee8bc4e7785b025eefef832edd3f9b144c5b94483
parent903ec5234dc88ef5e876f4476caa4c5ffed5bdb2 (diff)
downloadpaludis-b970f1a6fd29a3f58b7ce030bd128e6e9c20aaae.tar.gz
paludis-b970f1a6fd29a3f58b7ce030bd128e6e9c20aaae.tar.xz
Be more anal
-rw-r--r--paludis/repositories/e/exheres_layout.cc3
-rw-r--r--paludis/repositories/e/traditional_layout.cc3
2 files changed, 4 insertions, 2 deletions
diff --git a/paludis/repositories/e/exheres_layout.cc b/paludis/repositories/e/exheres_layout.cc
index 51d8e4c..675eda4 100644
--- a/paludis/repositories/e/exheres_layout.cc
+++ b/paludis/repositories/e/exheres_layout.cc
@@ -208,7 +208,8 @@ ExheresLayout::need_package_ids(const QualifiedPackageName & n) const
Log::get_instance()->message(ll_warning, lc_context, "Ignoring entry '" + stringify(*e)
+ "' for '" + stringify(n) + "' in repository '" + stringify(_imp->repository->name())
+ "' because another equivalent version already exists");
- v->push_back(id);
+ else
+ v->push_back(id);
}
catch (const Exception & ee)
{
diff --git a/paludis/repositories/e/traditional_layout.cc b/paludis/repositories/e/traditional_layout.cc
index 8ab6a46..c38b362 100644
--- a/paludis/repositories/e/traditional_layout.cc
+++ b/paludis/repositories/e/traditional_layout.cc
@@ -226,7 +226,8 @@ TraditionalLayout::need_package_ids(const QualifiedPackageName & n) const
Log::get_instance()->message(ll_warning, lc_context, "Ignoring entry '" + stringify(*e)
+ "' for '" + stringify(n) + "' in repository '" + stringify(_imp->repository->name())
+ "' because another equivalent version already exists");
- v->push_back(id);
+ else
+ v->push_back(id);
}
catch (const Exception & ee)
{