mirror of
https://github.com/munki/munki.git
synced 2026-04-28 00:13:45 -05:00
Update logouthelper to check for Managed Software Center instead of Managed Software Update
This commit is contained in:
@@ -84,7 +84,7 @@ def earliestForceInstallDate():
|
||||
|
||||
|
||||
def alertUserOfForcedLogout(info=None):
|
||||
'''Uses Managed Software Update.app to notify the user of an
|
||||
'''Uses Managed Software Center.app to notify the user of an
|
||||
upcoming forced logout.
|
||||
|
||||
Args:
|
||||
@@ -92,11 +92,11 @@ def alertUserOfForcedLogout(info=None):
|
||||
'''
|
||||
consoleuser = munkicommon.getconsoleuser()
|
||||
if not munkicommon.findProcesses(
|
||||
exe="/Applications/Utilities/Managed Software Update.app",
|
||||
exe="/Applications/Managed Software Center.app",
|
||||
user=consoleuser):
|
||||
# Managed Software Update.app isn't running.
|
||||
# Managed Software Center.app isn't running.
|
||||
# Use our LaunchAgent to start
|
||||
# Managed Software Update.app in the user context.
|
||||
# Managed Software Center.app in the user context.
|
||||
launchfile = '/var/run/com.googlecode.munki.ManagedSoftwareUpdate'
|
||||
f = open(launchfile, 'w')
|
||||
f.close()
|
||||
@@ -111,7 +111,7 @@ def alertUserOfForcedLogout(info=None):
|
||||
# if set, convert Python dictionary to NSDictionary.
|
||||
if info is not None:
|
||||
info = NSDictionary.dictionaryWithDictionary_(info)
|
||||
# cause MSU.app to display the Forced Logout warning
|
||||
# cause MSC.app to display the Forced Logout warning
|
||||
dnc = NSDistributedNotificationCenter.defaultCenter()
|
||||
dnc.postNotificationName_object_userInfo_options_(
|
||||
'com.googlecode.munki.ManagedSoftwareUpdate.logoutwarn',
|
||||
|
||||
Reference in New Issue
Block a user