Merge branch 'main' into downloader-client-certs

gocsaf · Aug 16, 2023 · 3bfff99 · 3bfff99
2 parents a7be72b + 7bab18f
commit 3bfff99
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/cmd/csaf_checker/config.go b/cmd/csaf_checker/config.go
@@ -40,7 +40,7 @@ type config struct {
 	Rate             *float64          `long:"rate" short:"r" description:"The average upper limit of https operations per second (defaults to unlimited)" toml:"rate"`
 	Years            *uint             `long:"years" short:"y" description:"Number of years to look back from now" value-name:"YEARS" toml:"years"`
 	Range            *models.TimeRange `long:"timerange" short:"t" description:"RANGE of time from which advisories to download" value-name:"RANGE" toml:"timerange"`
-	IgnorePattern    []string          `long:"ignorepattern" short:"i" description:"Dont download files if there URLs match any of the given PATTERNs" value-name:"PATTERN" toml:"ignorepattern"`
+	IgnorePattern    []string          `long:"ignorepattern" short:"i" description:"Do not download files if their URLs match any of the given PATTERNs" value-name:"PATTERN" toml:"ignorepattern"`
 	ExtraHeader      http.Header       `long:"header" short:"H" description:"One or more extra HTTP header fields" toml:"header"`
 
 	RemoteValidator        string   `long:"validator" description:"URL to validate documents remotely" value-name:"URL" toml:"validator"`

diff --git a/docs/csaf_checker.md b/docs/csaf_checker.md
@@ -18,7 +18,7 @@ Application Options:
   -r, --rate=                           The average upper limit of https operations per second (defaults to unlimited)
   -y, --years=YEARS                     Number of years to look back from now
   -t, --timerange=RANGE                 RANGE of time from which advisories to download
-  -i, --ignorepattern=PATTERN           Dont download files if there URLs match any of the given PATTERNs
+  -i, --ignorepattern=PATTERN           Do not download files if their URLs match any of the given PATTERNs
   -H, --header=                         One or more extra HTTP header fields
       --validator=URL                   URL to validate documents remotely
       --validatorcache=FILE             FILE to cache remote validations
@@ -102,8 +102,16 @@ It is only allowed to specify one off them.
 All interval boundaries are inclusive.
 
 You can ignore certain advisories while checking by specifying a list
+<<<<<<< HEAD
 of regular expressions to match their URLs by using the `ignorepattern` option. 
 E.g. `-i='.*white.*' -i='*.red.*'` will ignore files which URLs contain the sub strings **white** or **red**.
+=======
+of regular expressions to match their URLs by using the `ignorepattern`
+option.
+
+E.g. `-i='.*white.*' -i='*.red.*'` will ignore files which URLs contain
+the sub strings **white** or **red**.
+>>>>>>> main
 In the config file this has to be noted as:
 ```
 ignorepattern = [".*white.*", ".*red.*"]