aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2008-04-20 01:21:35 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2008-04-20 01:21:35 +0000
commit906511bf81d11dc3a76c63737c59fdd9451defa8 (patch)
tree5db72ef19215b1c7eb66f487683ba5baf494c01c
parent3c8bf22e5452bd14c3da7bb66f6b0de810295a18 (diff)
downloadpaludis-906511bf81d11dc3a76c63737c59fdd9451defa8.tar.gz
paludis-906511bf81d11dc3a76c63737c59fdd9451defa8.tar.xz
Remove --verbose option from reconcilio, and turn on the behaviour unconditionally.
-rw-r--r--NEWS4
-rw-r--r--src/clients/reconcilio/command_line.cc1
-rw-r--r--src/clients/reconcilio/command_line.hh1
-rw-r--r--src/clients/reconcilio/fix_linkage.cc31
4 files changed, 17 insertions, 20 deletions
diff --git a/NEWS b/NEWS
index 68598b2..286a5d1 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,10 @@ News for Paludis
This file lists the major changes between versions. For a more detailed list
of every change, see the ChangeLog.
+trunk/:
+ * reconcilio no longer accepts the --verbose switch; verbose display is
+ now turned on unconditionally.
+
0.26.0_pre2:
* paludis now supports ${root} in environment.conf. This can be
used when defining the "world" key, so that the configuration
diff --git a/src/clients/reconcilio/command_line.cc b/src/clients/reconcilio/command_line.cc
index 93d380f..136b9e7 100644
--- a/src/clients/reconcilio/command_line.cc
+++ b/src/clients/reconcilio/command_line.cc
@@ -42,7 +42,6 @@ CommandLine::CommandLine() :
a_no_color(&a_no_colour, "no-color"),
a_environment(&general_args, "environment", 'E', "Environment specification (class:suffix, both parts optional)"),
a_exact(&general_args, "exact", '\0', "Rebuild the same package version that is currently installed", true),
- a_verbose(&general_args, "verbose", 'v', "Display more detailed output", true),
a_resume_command_template(&general_args, "resume-command-template", '\0',
"Save the resume command to a file. If the filename contains 'XXXXXX', use mkstemp(3) to generate the filename"),
a_compact(&general_args, "compact", '\0', "Display output using one line per entry", true),
diff --git a/src/clients/reconcilio/command_line.hh b/src/clients/reconcilio/command_line.hh
index 6406f02..6d57f47 100644
--- a/src/clients/reconcilio/command_line.hh
+++ b/src/clients/reconcilio/command_line.hh
@@ -53,7 +53,6 @@ class CommandLine :
paludis::args::AliasArg a_no_color;
paludis::args::StringArg a_environment;
paludis::args::SwitchArg a_exact;
- paludis::args::SwitchArg a_verbose;
paludis::args::StringArg a_resume_command_template;
paludis::args::SwitchArg a_compact;
diff --git a/src/clients/reconcilio/fix_linkage.cc b/src/clients/reconcilio/fix_linkage.cc
index 894a6db..d4286b6 100644
--- a/src/clients/reconcilio/fix_linkage.cc
+++ b/src/clients/reconcilio/fix_linkage.cc
@@ -47,7 +47,6 @@ do_fix_linkage(const tr1::shared_ptr<Environment> & env)
{
Context ctx("When performing the Fix Linkage action:");
- bool verbose(CommandLine::get_instance()->a_verbose.specified());
std::string library(CommandLine::get_instance()->a_library.argument());
if (library.empty())
@@ -70,16 +69,13 @@ do_fix_linkage(const tr1::shared_ptr<Environment> & env)
std::cout << std::endl << colour(cl_heading, "Broken packages:") << std::endl;
else
std::cout << std::endl << colour(cl_heading, "Packages that depend on " + library + ":") << std::endl;
- if (! verbose)
- std::cout << std::endl;
}
tr1::shared_ptr<Sequence<std::string> > targets(new Sequence<std::string>);
for (BrokenLinkageFinder::BrokenPackageConstIterator pkg_it(finder.begin_broken_packages()),
pkg_it_end(finder.end_broken_packages()); pkg_it_end != pkg_it; ++pkg_it)
{
- if (verbose)
- std::cout << std::endl;
+ std::cout << std::endl;
std::string pkgname(stringify((*pkg_it)->name()));
std::string fullname((*pkg_it)->canonical_form(idcf_full));
@@ -88,18 +84,17 @@ do_fix_linkage(const tr1::shared_ptr<Environment> & env)
fullname.replace(pos, pkgname.length(), colour(cl_package_name, pkgname));
std::cout << "* " << fullname << std::endl;
- if (verbose)
- for (BrokenLinkageFinder::BrokenFileConstIterator file_it(finder.begin_broken_files(*pkg_it)),
- file_it_end(finder.end_broken_files(*pkg_it)); file_it_end != file_it; ++file_it)
- {
- std::cout << " " << *file_it;
- if (library.empty())
- std::cout << " (requires "
- << join(finder.begin_missing_requirements(*pkg_it, *file_it),
- finder.end_missing_requirements(*pkg_it, *file_it),
- " ") << ")";
- std::cout << std::endl;
- }
+ for (BrokenLinkageFinder::BrokenFileConstIterator file_it(finder.begin_broken_files(*pkg_it)),
+ file_it_end(finder.end_broken_files(*pkg_it)); file_it_end != file_it; ++file_it)
+ {
+ std::cout << " " << *file_it;
+ if (library.empty())
+ std::cout << " (requires "
+ << join(finder.begin_missing_requirements(*pkg_it, *file_it),
+ finder.end_missing_requirements(*pkg_it, *file_it),
+ " ") << ")";
+ std::cout << std::endl;
+ }
if (CommandLine::get_instance()->a_exact.specified())
targets->push_back(stringify(make_package_dep_spec()
@@ -113,7 +108,7 @@ do_fix_linkage(const tr1::shared_ptr<Environment> & env)
}
tr1::shared_ptr<const PackageID> orphans;
- if (verbose && finder.begin_broken_files(orphans) != finder.end_broken_files(orphans))
+ if (finder.begin_broken_files(orphans) != finder.end_broken_files(orphans))
{
if (library.empty())
std::cout << std::endl << "The following broken files are not owned by any installed package:" << std::endl;