From a303cfe72af76d3a492dbb59dce9944407c91aa2 Mon Sep 17 00:00:00 2001 From: Greg Neagle Date: Thu, 30 Mar 2017 22:25:42 -0700 Subject: [PATCH] AppleUpdates._run_softwareupdate(): properly find the local ptyexec tool --- code/client/munkilib/appleupdates/au.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/client/munkilib/appleupdates/au.py b/code/client/munkilib/appleupdates/au.py index 49774a27..7645cd9a 100644 --- a/code/client/munkilib/appleupdates/au.py +++ b/code/client/munkilib/appleupdates/au.py @@ -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