mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-05-07 12:59:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix processing of LocalOnlyManifest. Addresses #1270

Browse Source
This commit is contained in:
Greg Neagle
2025-09-25 09:03:50 -07:00
parent f9dcb96be9
commit d65b1d1b70
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/cli/munki/shared/updatecheck/manifests.swift
+3 -3
View File
@@ -298,11 +298,11 @@ func processManifest(
}
// process all included manifests first
for manifestName in manifestdata["included_manifests"] as? [String] ?? [] {
if manifestName.isEmpty {
for includedManifestName in manifestdata["included_manifests"] as? [String] ?? [] {
if includedManifestName.isEmpty {
continue
}
let nestedManifestPath = try getManifest(manifestName)
let nestedManifestPath = try getManifest(includedManifestName)
if stopRequested() {
return // maybe should throw a StopRequestedException?
}
code/cli/munki/shared/updatecheck/updatecheck.swift
+3 -1
View File
@@ -132,7 +132,9 @@ func processLocalOnlyManifest(catalogList: [String], installInfo: inout PlistDic
_ = try await processManifest(
localOnlyManifest,
forKey: key,
installInfo: &installInfo
installInfo: &installInfo,
parentCatalogs: catalogList,
manifestName: "LocalOnlyManifest \(localOnlyManifestName)"
)
if stopRequested() {
return