Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Update truncate_platform_version with new platforms / update gentoo #846

Merged
merged 1 commit into from
Aug 9, 2018
Merged

Update truncate_platform_version with new platforms / update gentoo #846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/omnibus/metadata.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,11 +173,11 @@ def truncate_platform_version(platform_version, platform)
when "centos", "debian", "el", "fedora", "freebsd", "omnios", "pidora", "raspbian", "rhel", "sles", "suse", "smartos", "nexus", "ios_xr"
# Only want MAJOR (e.g. Debian 7, OmniOS r151006, SmartOS 20120809T221258Z)
platform_version.split(".").first
when "aix", "alpine", "gentoo", "mac_os_x", "openbsd", "slackware", "solaris2", "opensuse", "ubuntu"
when "aix", "alpine", "mac_os_x", "openbsd", "slackware", "solaris2", "opensuse", "opensuseleap", "ubuntu", "amazon"
# Only want MAJOR.MINOR (e.g. Mac OS X 10.9, Ubuntu 12.04)
platform_version.split(".")[0..1].join(".")
when "arch"
# Arch Linux does not have a platform_version ohai attribute, it is rolling release (lsb_release -r)
when "arch", "gentoo"
# Arch Linux / Gentoo do not have a platform_version ohai attribute, they are rolling release (lsb_release -r)
"rolling"
when "windows"
# Windows has this really awesome "feature", where their version numbers
Expand Down
4 changes: 3 additions & 1 deletion spec/unit/metadata_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,19 +210,21 @@ module Omnibus
end

it_behaves_like "a version manipulator", "aix", "7.1", "7.1"
it_behaves_like "a version manipulator", "amazon", "2018.03", "2018.03"
it_behaves_like "a version manipulator", "arch", "rolling", "rolling"
it_behaves_like "a version manipulator", "centos", "5.9.6", "5"
it_behaves_like "a version manipulator", "debian", "7.1", "7"
it_behaves_like "a version manipulator", "debian", "6.9", "6"
it_behaves_like "a version manipulator", "el", "6.5", "6"
it_behaves_like "a version manipulator", "fedora", "11.5", "11"
it_behaves_like "a version manipulator", "freebsd", "10.0", "10"
it_behaves_like "a version manipulator", "gentoo", "2004.3", "2004.3"
it_behaves_like "a version manipulator", "gentoo", "4.9.95-gentoo", "rolling"
it_behaves_like "a version manipulator", "ios_xr", "6.0.0.14I", "6"
it_behaves_like "a version manipulator", "mac_os_x", "10.9.1", "10.9"
it_behaves_like "a version manipulator", "nexus", "5.0", "5"
it_behaves_like "a version manipulator", "omnios", "r151010", "r151010"
it_behaves_like "a version manipulator", "openbsd", "5.4.4", "5.4"
it_behaves_like "a version manipulator", "opensuseleap", "42.3", "42.3"
it_behaves_like "a version manipulator", "opensuse", "5.9", "5.9"
it_behaves_like "a version manipulator", "pidora", "11.5", "11"
it_behaves_like "a version manipulator", "raspbian", "7.1", "7"
Expand Down