public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Grafana Enterprise Packaging: Set to conflict with grafana, not replace (#58189) (#58418)

Browse Source 
* 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

(cherry picked from commit 786c7faff2)

Co-authored-by: Julien Duchesne <julien.duchesne@grafana.com>
This commit is contained in:
Grot (@grafanabot)
2022-11-08 08:11:54 -05:00
committed by GitHub
co-authored by Julien Duchesne
parent 0e5a094447
commit 1049636ef6
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/build/packaging/grafana.go
+1 -1
View File
@@ -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\"")