From 129ca8da55ab5d54222b119671bf641aa1a683b0 Mon Sep 17 00:00:00 2001 From: Daniele Rondina Date: Fri, 3 Apr 2020 18:32:26 +0200 Subject: [PATCH 1/2] Add version sanitized to Best() --- pkg/package/package.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/package/package.go b/pkg/package/package.go index fbe68701..33bfa5ce 100644 --- a/pkg/package/package.go +++ b/pkg/package/package.go @@ -466,8 +466,10 @@ func Best(set []Package) Package { versionsRaw := []string{} for _, p := range set { - versionsRaw = append(versionsRaw, p.GetVersion()) - versionsMap[p.GetVersion()] = p + // TODO: This is temporary!. + sanitizedVersion := strings.ReplaceAll(p.GetVersion(), "_", "-") + versionsRaw = append(versionsRaw, sanitizedVersion) + versionsMap[sanitizedVersion] = p } versions := make([]*version.Version, len(versionsRaw)) From d6faa3335f68b2ad6e9895f950880a7159594c21 Mon Sep 17 00:00:00 2001 From: Daniele Rondina Date: Fri, 3 Apr 2020 18:33:01 +0200 Subject: [PATCH 2/2] tests/integration/08_versioning.sh: Add version with _ --- tests/fixtures/versioning/libsndfile/definition.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/fixtures/versioning/libsndfile/definition.yaml b/tests/fixtures/versioning/libsndfile/definition.yaml index 81bf629a..5e5fa9d1 100644 --- a/tests/fixtures/versioning/libsndfile/definition.yaml +++ b/tests/fixtures/versioning/libsndfile/definition.yaml @@ -3,5 +3,5 @@ conflicts: null id: 0 license: LGPL-2.1 name: libsndfile -version: 1.0.29+1 -#version: 1.0.29+pre2_p20191024.1 +#version: 1.0.29+1 +version: 1.0.29+pre2_p20191024.1