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

take out another instance of 'launchctl bsexec' usage under 10.11

Browse Source
This commit is contained in:
Greg Neagle
2015-07-14 13:44:15 -07:00
parent 6f3b65feac
commit 441e649288
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/client/munkilib/adobeutils.py
View File

@@ -790,10 +790,14 @@ def runAdobeCCPpkgScript(dmgpath, payloads=None, operation='install'):
os.symlink(os.path.join(realdir, item),
os.path.join(tmpsubdir, item))
if (not munkicommon.getconsoleuser() or
munkicommon.getconsoleuser() == u"loginwindow"):
os_version_tuple = munkicommon.getOsVersion(as_tuple=True)
if (os_version_tuple < (10, 11) and
(not munkicommon.getconsoleuser() or
munkicommon.getconsoleuser() == u"loginwindow")):
# we're at the loginwindow, so we need to run the deployment
# manager in the loginwindow context using launchctl bsexec
# launchctl bsexec doesn't work for this in El Cap, so do it
# only if we're running Yosemite or earlier
loginwindowPID = utils.getPIDforProcessName("loginwindow")
cmd = ['/bin/launchctl', 'bsexec', loginwindowPID]
else: