diff options
| author |  Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2012-09-14 22:22:14 +0100 |
|---|---|---|
| committer | Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2012-09-14 22:22:14 +0100 |
| commit | 513a9f1632cdd271e52c44ca9ae37fed3de2efc6 (patch) | |
| tree | e03a28bb3c024ae103db83d2d6da2bcb7cb94764 | |
| parent | 3b9197aaab35a1ac0c61875447a86f336e486754 (diff) | |
| download | paludis-513a9f1632cdd271e52c44ca9ae37fed3de2efc6.tar.gz paludis-513a9f1632cdd271e52c44ca9ae37fed3de2efc6.tar.xz | |
Use EAPI rather than subslots to decide how to rewrite
| -rw-r--r-- | paludis/repositories/e/fix_locked_dependencies.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/paludis/repositories/e/fix_locked_dependencies.cc b/paludis/repositories/e/fix_locked_dependencies.cc index 1e9c249bd..36f71ffb6 100644 --- a/paludis/repositories/e/fix_locked_dependencies.cc +++ b/paludis/repositories/e/fix_locked_dependencies.cc @@ -1,7 +1,7 @@ /* vim: set sw=4 sts=4 et foldmethod=syntax : */ /* - * Copyright (c) 2008, 2009, 2010, 2011 Ciaran McCreesh + * Copyright (c) 2008, 2009, 2010, 2012 Ciaran McCreesh * * This file is part of the Paludis package manager. Paludis is free software; * you can redistribute it and/or modify it under the terms of the GNU General @@ -104,10 +104,10 @@ namespace if ((*matches->last())->slot_key()) { auto ss((*matches->last())->slot_key()->parse_value()); - if (ss.match_values().first == ss.match_values().second) - return std::make_shared<ELikeSlotExactPartialRequirement>(ss.match_values().first, spec->slot_requirement_ptr()); - else + if (eapi.supported()->ebuild_options()->has_subslots()) return std::make_shared<ELikeSlotExactFullRequirement>(ss.match_values(), spec->slot_requirement_ptr()); + else + return std::make_shared<ELikeSlotExactPartialRequirement>(ss.match_values().first, spec->slot_requirement_ptr()); } else return make_null_shared_ptr(); |