From d65b1d1b70e9062298ccb93dd4f18db799e3bcd1 Mon Sep 17 00:00:00 2001 From: Greg Neagle Date: Thu, 25 Sep 2025 09:03:50 -0700 Subject: [PATCH] Fix processing of LocalOnlyManifest. Addresses #1270 --- code/cli/munki/shared/updatecheck/manifests.swift | 6 +++--- code/cli/munki/shared/updatecheck/updatecheck.swift | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/code/cli/munki/shared/updatecheck/manifests.swift b/code/cli/munki/shared/updatecheck/manifests.swift index 6e901cb1..fb6aae5e 100644 --- a/code/cli/munki/shared/updatecheck/manifests.swift +++ b/code/cli/munki/shared/updatecheck/manifests.swift @@ -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? } diff --git a/code/cli/munki/shared/updatecheck/updatecheck.swift b/code/cli/munki/shared/updatecheck/updatecheck.swift index af2ab8e7..bc4fc831 100644 --- a/code/cli/munki/shared/updatecheck/updatecheck.swift +++ b/code/cli/munki/shared/updatecheck/updatecheck.swift @@ -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