From a4138526277f4e1dbed5603673cd00fb8017685d Mon Sep 17 00:00:00 2001 From: JanHoefelmeyer Date: Mon, 20 Nov 2023 11:05:57 +0100 Subject: [PATCH] Downloader: Only add tlp label to path if no custom directory is configured. Refactor accordingly --- cmd/csaf_downloader/downloader.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/csaf_downloader/downloader.go b/cmd/csaf_downloader/downloader.go index d40f31b..933f2a2 100644 --- a/cmd/csaf_downloader/downloader.go +++ b/cmd/csaf_downloader/downloader.go @@ -631,16 +631,16 @@ nextAdvisory: // Advisories that failed validation are store in a special folder. var newDir string if valStatus != validValidationStatus { - newDir = path.Join(d.cfg.Directory, failedValidationDir, lower) + newDir = path.Join(d.cfg.Directory, failedValidationDir) } else { - newDir = path.Join(d.cfg.Directory, lower) + newDir = d.cfg.Directory } // Do we have a configured destination folder? if d.cfg.Folder != "" { newDir = path.Join(newDir, d.cfg.Folder) } else { - newDir = path.Join(newDir, strconv.Itoa(initialReleaseDate.Year())) + newDir = path.Join(newDir, lower, strconv.Itoa(initialReleaseDate.Year())) } if newDir != lastDir {