Clean up the fall-back from /etc/os-release to /usr/lib/os-release

supervacuus · supervacuus · commit 700a65a4d8d2 · 2024-03-11T12:38:43.000+01:00
diff --git a/src/sentry_os.c b/src/sentry_os.c
@@ -348,11 +348,10 @@ sentry__get_os_context(void)
     if (sentry_value_is_null(os_dist)) {
         os_dist = get_linux_os_release("/usr/lib/os-release");
         if (sentry_value_is_null(os_dist)) {
-            sentry_value_set_by_key(os, "distribution", os_dist);
+            return os;
         }
-    } else {
-        sentry_value_set_by_key(os, "distribution", os_dist);
     }
+    sentry_value_set_by_key(os, "distribution", os_dist);
 #    endif // defined(SENTRY_PLATFORM_LINUX)
 
     return os;

Original file line number	Diff line number	Diff line change
`@@ -348,11 +348,10 @@ sentry__get_os_context(void)`
`348`	`348`	`if (sentry_value_is_null(os_dist)) {`
`349`	`349`	`os_dist = get_linux_os_release("/usr/lib/os-release");`
`350`	`350`	`if (sentry_value_is_null(os_dist)) {`
`351`		`- sentry_value_set_by_key(os, "distribution", os_dist);`
	`351`	`+ return os;`
`352`	`352`	`}`
`353`		`- } else {`
`354`		`- sentry_value_set_by_key(os, "distribution", os_dist);`
`355`	`353`	`}`
	`354`	`+ sentry_value_set_by_key(os, "distribution", os_dist);`
`356`	`355`	`# endif // defined(SENTRY_PLATFORM_LINUX)`
`357`	`356`
`358`	`357`	`return os;`