Better UI around Apple updates that don't require a restart on Apple …

…silicon
munki · May 24, 2022 · f6c618a · f6c618a
1 parent 450294b
commit f6c618a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/code/apps/Managed Software Center/Managed Software Center/MunkiItems.swift b/code/apps/Managed Software Center/Managed Software Center/MunkiItems.swift
@@ -1215,6 +1215,10 @@ func update_list_sort(_ lh: UpdateItem, _ rh: UpdateItem) -> Bool {
 func _build_update_list(_ filterAppleUpdates: Bool = false) -> [UpdateItem] {
     var update_items = [[String: Any]]()
     if !munkiUpdatesContainAppleItems() {
+        // don't show any Apple updates if there are Munki items that are Apple items
+    } else if (filterAppleUpdates && isAppleSilicon()) {
+        // we can't install any Apple updates on Apple silicon, so filter them all
+    } else {
         for var item in getAppleUpdates() {
             if (filterAppleUpdates &&
                 ((item["RestartAction"] as? String ?? "").hasSuffix("Restart"))) {

diff --git a/code/client/munkilib/appleupdates/au.py b/code/client/munkilib/appleupdates/au.py
@@ -443,7 +443,8 @@ def get_apple_updates(self):
                     su_info['RestartAction'] = 'RequireRestart'
                 apple_updates.append(su_info)
                 continue
-            elif not self.update_downloaded(product_key):
+            elif not info.is_apple_silicon() and not self.update_downloaded(product_key):
+                # only check for downloaded if Intel
                 display.display_warning(
                     'Product %s does not appear to be downloaded',
                     product_key)