Skip to content

Commit 6f287f4

Browse files
authored
Merge pull request #5229 from swiftlang/automerge/merge-main-2025-06-30_09-06
Merge `main` into `release/6.2`
2 parents 45a1606 + ae61520 commit 6f287f4

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

Sources/CoreFoundation/CFPlatform.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2321,11 +2321,13 @@ CF_EXPORT int _CFPosixSpawnFileActionsChdir(_CFPosixSpawnFileActionsRef file_act
23212321
// Glibc versions prior to 2.29 don't support posix_spawn_file_actions_addchdir_np, impacting:
23222322
// - Amazon Linux 2 (EoL mid-2025)
23232323
return ENOSYS;
2324-
#elif defined(__OpenBSD__) || defined(__QNX__) || (defined(__ANDROID__) && __ANDROID_API__ < 34)
2324+
#elif defined(__ANDROID__) && __ANDROID_API__ < 34
2325+
// Android versions prior to 14 (API level 34) don't support posix_spawn_file_actions_addchdir_np
2326+
return ENOSYS;
2327+
#elif defined(__OpenBSD__) || defined(__QNX__)
23252328
// Currently missing as of:
23262329
// - OpenBSD 7.5 (April 2024)
23272330
// - QNX 8 (December 2023)
2328-
// - Android 13
23292331
return ENOSYS;
23302332
#elif defined(__GLIBC__) || TARGET_OS_DARWIN || defined(__FreeBSD__) || defined(__ANDROID__) || defined(__musl__)
23312333
// Pre-standard posix_spawn_file_actions_addchdir_np version available in:

Sources/plutil/PLUContext.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,9 @@ struct PrintCommand {
772772
let description = number.description
773773
result.append("\(description)\n")
774774
} else {
775-
throw PLUContextError.argument("Unknown property list type")
775+
// Use a generic description
776+
result.append(String(describing: value))
777+
result.append("\n")
776778
}
777779
return result
778780
}

0 commit comments

Comments
 (0)