diff options
author | 2011-01-08 05:40:01 +0000 | |
---|---|---|
committer | 2011-01-08 05:40:01 +0000 | |
commit | d3d81bdacdbb538559390f78731ec50b5ed63f83 (patch) | |
tree | 07894f387c5128931a87cfd719969fdf541bf7a6 | |
parent | 07bd74e326564103424a1488e3f688b858c02c96 (diff) | |
download | paludis-d3d81bdacdbb538559390f78731ec50b5ed63f83.tar.gz paludis-d3d81bdacdbb538559390f78731ec50b5ed63f83.tar.xz |
Fix security report
-rw-r--r-- | src/clients/cave/cmd_report-fmt.hh | 4 | ||||
-rw-r--r-- | src/clients/cave/cmd_report.cc | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/clients/cave/cmd_report-fmt.hh b/src/clients/cave/cmd_report-fmt.hh index 30f6c145c..3fe48a58f 100644 --- a/src/clients/cave/cmd_report-fmt.hh +++ b/src/clients/cave/cmd_report-fmt.hh @@ -12,8 +12,8 @@ const auto fs_package_origin = make_format_string_fetcher("report/origin", 1) const auto fs_package_origin_masked = make_format_string_fetcher("report/origin_masked", 1) << " Masked in original repository\\n"; -const auto fs_package_origin_insecure = make_format_string_fetcher("report/origin_insecure", 1) - << " Marked as insecure\\n"; +const auto fs_package_insecure = make_format_string_fetcher("report/insecure", 1) + << " Marked as insecure\\n"; const auto fs_package_unused = make_format_string_fetcher("report/unused", 1) << " Not used by any package in world\\n"; diff --git a/src/clients/cave/cmd_report.cc b/src/clients/cave/cmd_report.cc index 8bbc34881..1a0d39911 100644 --- a/src/clients/cave/cmd_report.cc +++ b/src/clients/cave/cmd_report.cc @@ -223,12 +223,12 @@ ReportCommand::run( need_heading_origin(done_heading, done_heading_origin, *i, origin); cout << fuc(fs_package_origin_masked()); } + } - if (insecurity && match_package_in_set(*env, *insecurity, origin, { })) - { - need_heading_origin(done_heading, done_heading_origin, *i, origin); - cout << fuc(fs_package_origin_insecure()); - } + if (insecurity && match_package_in_set(*env, *insecurity, *i, { })) + { + need_heading(done_heading, *i); + cout << fuc(fs_package_insecure()); } if (unused->end() != unused->find(*i)) @@ -238,7 +238,7 @@ ReportCommand::run( (! (*i)->supports_action(SupportsActionTest<UninstallAction>()))) { /* ok, or weird */ - } + } else { need_heading(done_heading, *i); |