aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-01-08 05:49:04 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-01-08 05:49:04 +0000
commitefb394ade56ec2ca164d3125a9406505d2f8ba9d (patch)
treeb21fdbbe66ebde05d205cfede818f9c160074641
parent331985caa0159aece65c828b0ab5449bebabfc5c (diff)
downloadpaludis-efb394ade56ec2ca164d3125a9406505d2f8ba9d.tar.gz
paludis-efb394ade56ec2ca164d3125a9406505d2f8ba9d.tar.xz
Fix security report
-rw-r--r--src/clients/cave/cmd_report-fmt.hh4
-rw-r--r--src/clients/cave/cmd_report.cc14
2 files changed, 9 insertions, 9 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 61aac55f4..1392a42dd 100644
--- a/src/clients/cave/cmd_report.cc
+++ b/src/clients/cave/cmd_report.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2010 Ciaran McCreesh
+ * Copyright (c) 2010, 2011 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
@@ -224,12 +224,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))
@@ -239,7 +239,7 @@ ReportCommand::run(
(! (*i)->supports_action(SupportsActionTest<UninstallAction>())))
{
/* ok, or weird */
- }
+ }
else
{
need_heading(done_heading, *i);