particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update osbuild/images to v0.35.0

Browse source 
Signed-off-by: Tomáš Hozza <thozza@redhat.com>
This commit is contained in:
Tomáš Hozza 2024-02-05 14:58:31 +01:00 • committed by Sanne Raymaekers
parent 44426bb48f
commit f6d35ac5ad
8 changed files with 51 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

7
vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go generated vendored
View file

@ -474,14 +474,17 @@ func ParseID(idStr string) (*distro.ID, error) {
return nil, fmt.Errorf("invalid distro name: %s", id.Name)
}
// Backward compatibility layer for "rhel-93" and friends
// Backward compatibility layer for "rhel-93" or "rhel-910"
if id.Name == "rhel" && id.MinorVersion == -1 {
if id.MajorVersion/10 == 9 {
// handle single digit minor version
id.MinorVersion = id.MajorVersion % 10
id.MajorVersion = 9
} else if id.MajorVersion/100 == 9 {
// handle two digit minor version
id.MinorVersion = id.MajorVersion % 100
id.MajorVersion = 9
}
// two digit minor versions in the old format are not supported
}
if id.MajorVersion != 9 {