Infrastructure/forgejo
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-23 07:43:18 -05:00
Code Issues Activity

Fix version in rpm repodata/primary.xml.gz (#26009)

Browse source 
The version listed in rpm repodata should only contain the rpm version
(1.0.0) and not the combination of version and release (1.0.0-2). We
correct this behaviour in primary.xml.gz, filelists.xml.gz and
others.xml.gz.

Signed-off-by: Peter Verraedt <peter@verraedt.be>
This commit is contained in:
Peter Verraedt 2023-07-21 21:41:38 +02:00 committed by GitHub
parent 52fb936773
commit 48cd82b759
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
services/packages/rpm/repository.go
View file

@ -378,7 +378,7 @@ func buildPrimary(pv *packages_model.PackageVersion, pfs []*packages_model.Packa
Architecture: pd.FileMetadata.Architecture, Architecture: pd.FileMetadata.Architecture,
Version: Version{ Version: Version{
Epoch: pd.FileMetadata.Epoch, Epoch: pd.FileMetadata.Epoch,
Version: pd.Version.Version, Version: pd.FileMetadata.Version,
Release: pd.FileMetadata.Release, Release: pd.FileMetadata.Release,
}, },
Checksum: Checksum{ Checksum: Checksum{
@ -466,7 +466,7 @@ func buildFilelists(pv *packages_model.PackageVersion, pfs []*packages_model.Pac
Architecture: pd.FileMetadata.Architecture, Architecture: pd.FileMetadata.Architecture,
Version: Version{ Version: Version{
Epoch: pd.FileMetadata.Epoch, Epoch: pd.FileMetadata.Epoch,
Version: pd.Version.Version, Version: pd.FileMetadata.Version,
Release: pd.FileMetadata.Release, Release: pd.FileMetadata.Release,
}, },
Files: pd.FileMetadata.Files, Files: pd.FileMetadata.Files,
@ -513,7 +513,7 @@ func buildOther(pv *packages_model.PackageVersion, pfs []*packages_model.Package
Architecture: pd.FileMetadata.Architecture, Architecture: pd.FileMetadata.Architecture,
Version: Version{ Version: Version{
Epoch: pd.FileMetadata.Epoch, Epoch: pd.FileMetadata.Epoch,
Version: pd.Version.Version, Version: pd.FileMetadata.Version,
Release: pd.FileMetadata.Release, Release: pd.FileMetadata.Release,
}, },
Changelogs: pd.FileMetadata.Changelogs, Changelogs: pd.FileMetadata.Changelogs,

10
tests/integration/api_packages_rpm_test.go
View file

@ -196,15 +196,15 @@ gpgkey=%sapi/packages/%s/rpm/repository.key`, user.Name, user.Name, setting.AppN
switch d.Type { switch d.Type {
case "primary": case "primary":
assert.EqualValues(t, 718, d.Size) assert.EqualValues(t, 718, d.Size)
assert.EqualValues(t, 1731, d.OpenSize) assert.EqualValues(t, 1729, d.OpenSize)
assert.Equal(t, "repodata/primary.xml.gz", d.Location.Href) assert.Equal(t, "repodata/primary.xml.gz", d.Location.Href)
case "filelists": case "filelists":
assert.EqualValues(t, 258, d.Size) assert.EqualValues(t, 257, d.Size)
assert.EqualValues(t, 328, d.OpenSize) assert.EqualValues(t, 326, d.OpenSize)
assert.Equal(t, "repodata/filelists.xml.gz", d.Location.Href) assert.Equal(t, "repodata/filelists.xml.gz", d.Location.Href)
case "other": case "other":
assert.EqualValues(t, 308, d.Size) assert.EqualValues(t, 306, d.Size)
assert.EqualValues(t, 396, d.OpenSize) assert.EqualValues(t, 394, d.OpenSize)
assert.Equal(t, "repodata/other.xml.gz", d.Location.Href) assert.Equal(t, "repodata/other.xml.gz", d.Location.Href)
} }
} }