mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-04-26 06:48:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix for issue where a (newer) forced logout warning replaces a currently displayed forced logout warning in MSU.app

Browse Source 
git-svn-id: http://munki.googlecode.com/svn/trunk@1275 a4e17f2e-e282-11dd-95e1-755cbddbdd66
This commit is contained in:
Greg Neagle
2011-08-05 23:18:28 +00:00
parent c6008abbc0
commit bdd9ca8b0e
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/Managed Software Update/MSUAppDelegate.py
+6 -2
View File
@@ -670,8 +670,12 @@ class MSUAppDelegate(NSObject):
@PyObjCTools.AppHelper.endSheetMethod
def forceLogoutWarningDidEnd_returnCode_contextInfo_(self, alert, returncode, contextinfo):
self._currentAlert = None
btn_pressed = self._force_warning_btns[returncode]
if btn_pressed == self._force_warning_logout_btn:
btn_pressed = self._force_warning_btns.get(returncode)
if not btn_pressed:
# sheet was dismissed via NSApp.endSheet()
# and not via button press, so do nothing
pass
elif btn_pressed == self._force_warning_logout_btn:
munki.log("user", "install_with_logout")
result = munki.logoutAndUpdate()
else: