From 2fdf7624da381af605baa46f319f2ed3015807e4 Mon Sep 17 00:00:00 2001 From: "Thibault \"bui\" Koechlin" Date: Fri, 23 Oct 2020 13:48:04 +0200 Subject: [PATCH] properly honor the --force flag of upgrade (#327) --- cmd/crowdsec-cli/upgrade.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmd/crowdsec-cli/upgrade.go b/cmd/crowdsec-cli/upgrade.go index 4c865c9b7..6c121167f 100644 --- a/cmd/crowdsec-cli/upgrade.go +++ b/cmd/crowdsec-cli/upgrade.go @@ -31,7 +31,7 @@ func UpgradeConfig(ttype string, name string) { continue } found = true - if v.UpToDate { + if v.UpToDate && !force_upgrade { log.Infof("%s : up-to-date", v.Name) continue } @@ -40,10 +40,12 @@ func UpgradeConfig(ttype string, name string) { log.Fatalf("%s : download failed : %v", v.Name, err) } if !v.UpToDate { - if v.Tainted { + if v.Tainted && !force_upgrade { log.Infof("%v %s is tainted, --force to overwrite", emoji.Warning, v.Name) + continue } else if v.Local { log.Infof("%v %s is local", emoji.Prohibited, v.Name) + continue } } else { log.Infof("%v %s : updated", emoji.Package, v.Name)