mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-01-08 07:29:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Some refactoring

Browse Source
This commit is contained in:
Greg Neagle
2022-08-25 15:26:52 -07:00
parent 456ef3228b
commit 528281bdd0
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/apps/Managed Software Center/Managed Software Center/osinstaller.swift Normal file
View File

@@ -0,0 +1,9 @@
//
// osinstaller.swift
// Managed Software Center
//
// Created by Greg Neagle on 8/25/22.
// Copyright © 2022 The Munki Project. All rights reserved.
//
import Foundation

7
code/client/munkilib/osinstaller.py
View File

@@ -682,8 +682,6 @@ def create_osinstaller_info(iteminfo):
'description_staged',
iteminfo.get('description', '')
)
if iteminfo.get('localized_strings'):
osinstaller_info['localized_strings'] = iteminfo['localized_strings']
osinstaller_info['installed_size'] = iteminfo.get(
'installed_size',
iteminfo.get('installer_item_size', 0)
@@ -695,7 +693,7 @@ def create_osinstaller_info(iteminfo):
)
osinstaller_info['developer'] = "Apple"
# optional keys to copy if they exist
optional_keys = ['icon_name']
optional_keys = ['icon_name', 'localized_strings']
for key in optional_keys:
if key in iteminfo:
osinstaller_info[key] = iteminfo[key]
@@ -712,7 +710,8 @@ def record_staged_os_installer(iteminfo):
try:
FoundationPlist.writePlist(staged_os_installer_info, infopath)
except FoundationPlist.FoundationPlistException as err:
display.display_error("Error recording staged macOS installer: %s" % err)
display.display_error(
"Error recording staged macOS installer: %s" % err)
# finally, trigger a verification
verify_staged_os_installer(staged_os_installer_info["osinstaller_path"])
else: