From d4af341b0f03f42ea37bf726938e09f7c7c8c00f Mon Sep 17 00:00:00 2001
From: Kota Kanbe <kotakanbe@gmail.com>
Date: Wed, 3 Feb 2021 07:37:19 +0900
Subject: [PATCH] fix(report): remove duplicated refreshing logic when report
 with -diff (#1160)

---
 report/report.go  | 8 +-------
 report/util.go    | 2 +-
 subcmds/report.go | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/report/report.go b/report/report.go
index 19fc433c..aa6d751f 100644
--- a/report/report.go
+++ b/report/report.go
@@ -127,16 +127,10 @@ func FillCveInfos(dbclient DBClient, rs []models.ScanResult, dir string) ([]mode
 			return nil, err
 		}
 
-		diff, err := diff(rs, prevs)
+		rs, err = diff(rs, prevs)
 		if err != nil {
 			return nil, err
 		}
-		for i, r := range diff {
-			if err := fillCvesWithNvdJvn(dbclient.CveDB, &r); err != nil {
-				return nil, err
-			}
-			rs[i] = r
-		}
 	}
 
 	for i, r := range rs {
diff --git a/report/util.go b/report/util.go
index 716f41a9..5f14fa70 100644
--- a/report/util.go
+++ b/report/util.go
@@ -504,7 +504,7 @@ func loadPrevious(currs models.ScanResults) (prevs models.ScanResults, err error
 			path := filepath.Join(dir, filename)
 			r, err := loadOneServerScanResult(path)
 			if err != nil {
-				util.Log.Errorf("%+v", err)
+				util.Log.Debugf("%+v", err)
 				continue
 			}
 			if r.Family == result.Family && r.Release == result.Release {
diff --git a/subcmds/report.go b/subcmds/report.go
index c255453a..4676f226 100644
--- a/subcmds/report.go
+++ b/subcmds/report.go
@@ -96,7 +96,7 @@ func (p *ReportCmd) SetFlags(f *flag.FlagSet) {
 		"-cvss-over=6.5 means reporting CVSS Score 6.5 and over (default: 0 (means report all))")
 
 	f.BoolVar(&c.Conf.Diff, "diff", false,
-		"Difference between previous result and current result ")
+		"Difference between previous result and current result")
 
 	f.BoolVar(&c.Conf.IgnoreUnscoredCves, "ignore-unscored-cves", false,
 		"Don't report the unscored CVEs")