aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2010-08-17 23:14:07 +0100
committerAvatar David Leverton <levertond@googlemail.com> 2010-08-17 23:14:07 +0100
commit80bff7af12ff77eef264ff3581b333a839f7a35f (patch)
treefe017f5d7200baec1dc68fe1de71079d08b5a1b4
parentfd97abd6755edd293b7c28fbdfdc06bff5b58ab0 (diff)
downloadpaludis-80bff7af12ff77eef264ff3581b333a839f7a35f.tar.gz
paludis-80bff7af12ff77eef264ff3581b333a839f7a35f.tar.xz
Doesn't make sense to elide this with multiple --library arguments supported
-rw-r--r--src/clients/cave/cmd_fix_linkage.cc26
1 files changed, 11 insertions, 15 deletions
diff --git a/src/clients/cave/cmd_fix_linkage.cc b/src/clients/cave/cmd_fix_linkage.cc
index 3d7334b..218a40b 100644
--- a/src/clients/cave/cmd_fix_linkage.cc
+++ b/src/clients/cave/cmd_fix_linkage.cc
@@ -201,15 +201,12 @@ FixLinkageCommand::run(
file_it_end(finder->end_broken_files(*pkg_it)); file_it_end != file_it; ++file_it)
{
cout << " " << *file_it;
- if (libraries->empty())
- {
- cout << " (requires "
- << join(finder->begin_missing_requirements(*pkg_it, *file_it),
- finder->end_missing_requirements(*pkg_it, *file_it),
- " ") << ")";
- std::copy(finder->begin_missing_requirements(*pkg_it, *file_it), finder->end_missing_requirements(*pkg_it, *file_it),
- std::inserter(broken_files, broken_files.end()));
- }
+ cout << " (requires "
+ << join(finder->begin_missing_requirements(*pkg_it, *file_it),
+ finder->end_missing_requirements(*pkg_it, *file_it),
+ " ") << ")";
+ std::copy(finder->begin_missing_requirements(*pkg_it, *file_it), finder->end_missing_requirements(*pkg_it, *file_it),
+ std::inserter(broken_files, broken_files.end()));
cout << endl;
}
@@ -232,17 +229,16 @@ FixLinkageCommand::run(
if (libraries->empty())
cout << endl << "The following broken files are not owned by any installed package:" << endl;
else
- cout << endl << "The following files that depend on " << join(libraries->begin(), libraries->end(), ", ") << " are not owned by any installed package:" << endl;
+ cout << endl << "The following files that depend on the specified library(ies) are not owned by any installed package:" << endl;
for (BrokenLinkageFinder::BrokenFileConstIterator file_it(finder->begin_broken_files(orphans)),
file_it_end(finder->end_broken_files(orphans)); file_it_end != file_it; ++file_it)
{
cout << " " << *file_it;
- if (libraries->empty())
- cout << " (requires "
- << join(finder->begin_missing_requirements(orphans, *file_it),
- finder->end_missing_requirements(orphans, *file_it),
- " ") << ")";
+ cout << " (requires "
+ << join(finder->begin_missing_requirements(orphans, *file_it),
+ finder->end_missing_requirements(orphans, *file_it),
+ " ") << ")";
cout << endl;
}
}