aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2008-11-11 21:26:13 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2008-11-11 21:26:13 +0000
commit634aa07ea0e8fa854308f81db2f72af1fca907bd (patch)
tree6cb53cd83b97819bb133e9632d6b9717eec36c61
parent3471ebfc306c02be0b10caab18b3d0a131a10e71 (diff)
downloadpaludis-634aa07ea0e8fa854308f81db2f72af1fca907bd.tar.gz
paludis-634aa07ea0e8fa854308f81db2f72af1fca907bd.tar.xz
Don't trigger if-use-changed for USE_EXPAND things that aren't in IUSE
-rw-r--r--paludis/dep_list.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/paludis/dep_list.cc b/paludis/dep_list.cc
index fb3dca0..ba7119f 100644
--- a/paludis/dep_list.cc
+++ b/paludis/dep_list.cc
@@ -1501,7 +1501,8 @@ DepList::prefer_installed_over_uninstalled(const PackageID & installed,
for (Choice::ConstIterator i((*k)->begin()), i_end((*k)->end()) ;
i != i_end ; ++i)
- i_common.insert((*i)->name_with_prefix());
+ if ((*i)->explicitly_listed())
+ i_common.insert((*i)->name_with_prefix());
}
for (Choices::ConstIterator k(uninstalled.choices_key()->value()->begin()),
@@ -1513,7 +1514,8 @@ DepList::prefer_installed_over_uninstalled(const PackageID & installed,
for (Choice::ConstIterator i((*k)->begin()), i_end((*k)->end()) ;
i != i_end ; ++i)
- u_common.insert((*i)->name_with_prefix());
+ if ((*i)->explicitly_listed())
+ u_common.insert((*i)->name_with_prefix());
}
std::set_intersection(