Skip to content

Commit 3e3a109

Browse files
KN4CK3Rjerger
authored andcommitted
Fix invalid version in RPM package path (go-gitea#34112)
(cherry picked from commit 8fed70a)
1 parent 5199075 commit 3e3a109

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

services/packages/rpm/repository.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,6 @@ func buildPrimary(ctx context.Context, pv *packages_model.PackageVersion, pfs []
410410
files = append(files, f)
411411
}
412412
}
413-
packageVersion := fmt.Sprintf("%s-%s", pd.FileMetadata.Version, pd.FileMetadata.Release)
414413
packages = append(packages, &Package{
415414
Type: "rpm",
416415
Name: pd.Package.Name,
@@ -439,7 +438,7 @@ func buildPrimary(ctx context.Context, pv *packages_model.PackageVersion, pfs []
439438
Archive: pd.FileMetadata.ArchiveSize,
440439
},
441440
Location: Location{
442-
Href: fmt.Sprintf("package/%s/%s/%s/%s-%s.%s.rpm", pd.Package.Name, packageVersion, pd.FileMetadata.Architecture, pd.Package.Name, packageVersion, pd.FileMetadata.Architecture),
441+
Href: fmt.Sprintf("package/%s/%s/%s/%s-%s.%s.rpm", pd.Package.Name, pd.Version.Version, pd.FileMetadata.Architecture, pd.Package.Name, pd.Version.Version, pd.FileMetadata.Architecture),
443442
},
444443
Format: Format{
445444
License: pd.VersionMetadata.License,

0 commit comments

Comments
 (0)