mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-05-25 15:48:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Addresses #1267 where removals might consider/process the same item multiple times

Browse Source
This commit is contained in:
Greg Neagle
2025-09-19 13:20:54 -07:00
parent 9c3d199ff3
commit e498022578
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/cli/munki/shared/updatecheck/catalogs.swift
+18 -8
View File
@@ -177,18 +177,28 @@ func getAllItemsWithName(_ name: String, catalogList: [String]) -> [PlistDict] {
let nameTable = catalogDB["named"] as? CatalogDBTable,
let versionsDict = nameTable[itemName]
{
var indexesToAdd: Set<Int> = []
for (version, indexes) in versionsDict {
if version == "latest" {
continue
}
indexesToAdd.formUnion(indexes)
}
for index in indexesToAdd {
let item = items[index]
let version = item["version"] as? String ?? "<unknown>"
display.debug1("Adding item \(itemName), version \(version) from catalog \(catalogName)...")
itemList.append(item)
for index in indexes {
do {
let item = items[index]
// need to compare encoded representations because
// PlistDict (aka [String: Any] is not hashable
let itemEncoded = try plistToData(item)
let alreadyAddedItem = try itemList.contains(
where: { try plistToData($0) == itemEncoded })
if !alreadyAddedItem {
let version = item["version"] as? String ?? "<unknown>"
display.debug1("Adding item \(itemName), version \(version) from catalog \(catalogName)...")
itemList.append(item)
}
} catch {
// error converting an item to plistData. Really unlikely,
// but if it happens we just don't add the item and continue on
}
}
}
}
}