From 786c7faff2c70a563bd1f3f391e28564d1c59964 Mon Sep 17 00:00:00 2001 From: Julien Duchesne Date: Tue, 8 Nov 2022 07:08:01 -0500 Subject: [PATCH] Grafana Enterprise Packaging: Set to conflict with `grafana`, not replace (#58189) * Grafana Enterprise Packaging: Set to conflict with `grafana`, not replace When `grafana` and `grafana-enterprise` are in the same RPM repository, grafana-enterprise takes precedence over Grafana This is not what we want. Users should be able to install either OSS or Enterprise * Set it only one way. It's how it's currently tested --- pkg/build/packaging/grafana.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/build/packaging/grafana.go b/pkg/build/packaging/grafana.go index 3aaf743a5be..6d48dbb8b57 100644 --- a/pkg/build/packaging/grafana.go +++ b/pkg/build/packaging/grafana.go @@ -384,7 +384,7 @@ func executeFPM(options linuxPackageOptions, packageRoot, srcDir string) error { "-a", string(options.packageArch), } if options.edition == config.EditionEnterprise || options.edition == config.EditionEnterprise2 || options.goArch == config.ArchARMv6 { - args = append(args, "--replaces", "grafana") + args = append(args, "--conflicts", "grafana") } if options.edition == config.EditionOSS { args = append(args, "--license", "\"AGPLv3\"")