From 68401bdcbefccd7583c6e392719b2d4bb9ccb145 Mon Sep 17 00:00:00 2001 From: Rajiv Shah Date: Fri, 25 Mar 2022 19:52:36 -0400 Subject: [PATCH] fix(contexts): Add patch version like sentry-native does --- sentry-contexts/src/utils.rs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sentry-contexts/src/utils.rs b/sentry-contexts/src/utils.rs index 4a4f8bca..24f17a9d 100644 --- a/sentry-contexts/src/utils.rs +++ b/sentry-contexts/src/utils.rs @@ -53,7 +53,12 @@ mod model_support { } pub fn get_macos_version() -> Option { - sysctlbyname_call("kern.osproductversion") + let version = sysctlbyname_call("kern.osproductversion")?; + let dot_count = version.split(".").count() - 1; + if dot_count < 2 { + return Some(version + ".0"); + } + Some(version) } pub fn get_macos_build() -> Option { @@ -84,6 +89,8 @@ mod model_support { fn test_macos_version_and_build() { let v = get_macos_version().unwrap(); assert!(v.chars().all(|c| c.is_digit(10) || c == '.')); + let dot_count = v.split(".").count() - 1; + assert_eq!(dot_count, 2); let b = get_macos_build().unwrap(); assert!(b.chars().all(|c| c.is_ascii_alphabetic() || c.is_digit(10))); }