From 30badbe1ddf03b37b6f693dced58a44f6d64b5fb Mon Sep 17 00:00:00 2001 From: booboy Date: Sun, 25 Oct 2020 04:13:21 -0500 Subject: [PATCH] change the logic of sorting --- rpm_to_cve_parser/rhel_rpm_to_cve.rb | 5 +++-- rpm_to_cve_parser/rpm_pkg_audit.rb | 8 +++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/rpm_to_cve_parser/rhel_rpm_to_cve.rb b/rpm_to_cve_parser/rhel_rpm_to_cve.rb index 7a7a579..bd29305 100755 --- a/rpm_to_cve_parser/rhel_rpm_to_cve.rb +++ b/rpm_to_cve_parser/rhel_rpm_to_cve.rb @@ -13,7 +13,7 @@ class RhelRpmToCve def list_pkg_names xml[:rpms][:rpm].map do |key| key.first[:rpm] - end.sort + end end def pkg_exists?(pkg_name) @@ -30,7 +30,8 @@ class RhelRpmToCve :rhel_package_name => pkg_name, :cves => results.map {|cve| cve} } - + else + 'Package not found.' end end diff --git a/rpm_to_cve_parser/rpm_pkg_audit.rb b/rpm_to_cve_parser/rpm_pkg_audit.rb index 94b261d..b82820a 100755 --- a/rpm_to_cve_parser/rpm_pkg_audit.rb +++ b/rpm_to_cve_parser/rpm_pkg_audit.rb @@ -25,10 +25,8 @@ parser.parse! pkg_name = options[:pkg] rpm_auditer = RhelRpmToCve.new(data_file) -if rpm_auditer.pkg_exists?(pkg_name) +if pkg_name pp rpm_auditer.cves_per_pkg_name(pkg_name) -elsif options.key?(:list) - puts rpm_auditer.list_pkg_names -else - puts 'Package not found.' +else options.key?(:list) + puts rpm_auditer.list_pkg_names.sort end