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

AppleUpdates._run_softwareupdate(): properly find the local ptyexec tool

Browse Source
This commit is contained in:
Greg Neagle
2017-03-30 22:25:42 -07:00
parent de288f6460
commit a303cfe72a
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/client/munkilib/appleupdates/au.py
View File

@@ -512,11 +512,14 @@ class AppleUpdates(object):
# device so its output is unbuffered so we can get progress info
#
# Try to find our ptyexec tool
# first look in the parent directory of this file's directory
# first look in the parent directory of the parent directory of this
# file's directory
# (../)
parent_dir = os.path.dirname(
parent_dir = (
os.path.dirname(
os.path.abspath(__file__)))
os.path.dirname(
os.path.dirname(
os.path.abspath(__file__)))))
ptyexec_path = os.path.join(parent_dir, 'ptyexec')
if not os.path.exists(ptyexec_path):
# try absolute path in munki's normal install dir