mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-02-26 02:49:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue on Mountain Lion where managedsoftwareupdate status updates were not being properly displayed under Mountain Lion.

Browse Source
This commit is contained in:
Greg Neagle
2014-08-15 16:32:24 -07:00
parent 2ff9b08ad9
commit e81ab5e37a
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/apps/Managed Software Center/Managed Software Center/MSUStatusController.py
View File

@@ -120,20 +120,25 @@ class MSUStatusController(NSObject):
def updateStatus_(self, notification):
'''Got update status notification from managedsoftwareupdate'''
msulog.debug_log('Got munkistatus update notification')
self.got_status_update = True
info = notification.userInfo()
if 'message' in info:
msulog.debug_log('%s' % info)
# explictly get keys from info object; PyObjC in Mountain Lion
# seems to need this
info_keys = info.keys()
if 'message' in info_keys:
self.setMessage_(info['message'])
if 'detail' in info:
if 'detail' in info_keys:
self.setDetail_(info['detail'])
if 'percent' in info:
if 'percent' in info_keys:
self.setPercentageDone_(info['percent'])
if 'stop_button_visible' in info:
if 'stop_button_visible' in info_keys:
if info['stop_button_visible']:
self.showStopButton()
else:
self.hideStopButton()
if 'stop_button_enabled' in info:
if 'stop_button_enabled' in info_keys:
if info['stop_button_enabled']:
self.enableStopButton()
else:

13
code/apps/MunkiStatus/MunkiStatus/MSUStatusWindowController.py
View File

@@ -233,18 +233,21 @@ class MSUStatusWindowController(NSObject):
def updateStatus_(self, notification):
self.got_status_update = True
info = notification.userInfo()
if 'message' in info:
# explictly get keys from info object; PyObjC in Mountain Lion
# seems to need this
info_keys = info.keys()
if 'message' in info_keys:
self.setMessage_(info['message'])
if 'detail' in info:
if 'detail' in info_keys:
self.setDetail_(info['detail'])
if 'percent' in info:
if 'percent' in info_keys:
self.setPercentageDone_(info['percent'])
if self.stopBtnState == 0 and 'stop_button_visible' in info:
if self.stopBtnState == 0 and 'stop_button_visible' in info_keys:
if info['stop_button_visible']:
self.showStopButton()
else:
self.hideStopButton()
if self.stopBtnState == 0 and 'stop_button_enabled' in info:
if self.stopBtnState == 0 and 'stop_button_enabled' in info_keys:
if info['stop_button_enabled']:
self.enableStopButton()
else: