Maks1mS/ALR
1
0
Fork 0
forked from Plemya-x/ALR
Code Pull Requests Activity

fix: use platform specific release in compare

Browse Source
This commit is contained in:
Maxim Slipenko
2025-01-25 11:16:33 +03:00
parent 6410f7547b
commit 981f49587b
6 changed files with 73 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/build/build.go
View File

@@ -52,6 +52,7 @@ import (
"gitea.plemya-x.ru/Plemya-x/ALR/internal/cpu"
"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
"gitea.plemya-x.ru/Plemya-x/ALR/internal/dl"
"gitea.plemya-x.ru/Plemya-x/ALR/internal/overrides"
"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/decoder"
"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/handlers"
"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/helpers"
@@ -571,9 +572,7 @@ func buildPkgMetadata(
})
}
if pkgFormat == "rpm" && info.ID == "altlinux" {
pkgInfo.Release = "alt" + pkgInfo.Release
}
pkgInfo.Release = overrides.ReleasePlatformSpecific(vars.Release, info)
if vars.Epoch != 0 {
pkgInfo.Epoch = strconv.FormatUint(uint64(vars.Epoch), 10)

2
pkg/distro/osrelease.go
View File

@@ -44,6 +44,7 @@ type OSRelease struct {
SupportURL string
BugReportURL string
Logo string
PlatformID string
}
var parsed *OSRelease
@@ -102,6 +103,7 @@ func ParseOSRelease(ctx context.Context) (*OSRelease, error) {
SupportURL: runner.Vars["SUPPORT_URL"].Str,
BugReportURL: runner.Vars["BUG_REPORT_URL"].Str,
Logo: runner.Vars["LOGO"].Str,
PlatformID: runner.Vars["PLATFORM_ID"].Str,
}
distroUpdated := false