From ddf1940bf663b9cc4e68ea9642b9cdbae5e332d5 Mon Sep 17 00:00:00 2001 From: Greg Neagle Date: Wed, 14 Dec 2016 15:48:40 -0800 Subject: [PATCH] Move authrestart module out of munkicommon to root of munkilib --- code/client/managedsoftwareupdate | 3 ++- code/client/munkilib/{munkicommon => }/authrestart.py | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) rename code/client/munkilib/{munkicommon => }/authrestart.py (97%) diff --git a/code/client/managedsoftwareupdate b/code/client/managedsoftwareupdate index e7277c5e..dba04b47 100755 --- a/code/client/managedsoftwareupdate +++ b/code/client/managedsoftwareupdate @@ -62,6 +62,7 @@ else: from munkilib import appleupdates from munkilib import FoundationPlist from munkilib import utils + from munkilib import authrestart def signal_handler(signum, dummy_frame): @@ -286,7 +287,7 @@ def doRestart(): and os_version_tuple >= (10, 8)): munkicommon.display_debug1('Configured to perform AuthRestarts...') # try to perform an auth restart - if not munkicommon.perform_auth_restart(): + if not authrestart.perform_auth_restart(): # if we got to here then the auth restart failed # notify that it did then perform a normal restart munkicommon.display_warning( diff --git a/code/client/munkilib/munkicommon/authrestart.py b/code/client/munkilib/authrestart.py similarity index 97% rename from code/client/munkilib/munkicommon/authrestart.py rename to code/client/munkilib/authrestart.py index fcdc9441..2f0798eb 100755 --- a/code/client/munkilib/munkicommon/authrestart.py +++ b/code/client/munkilib/authrestart.py @@ -25,10 +25,11 @@ Functions supporting FileVault authrestart. import subprocess -from . import display -from . import osutils -from . import prefs -from .. import FoundationPlist +from .munkicommon import display +from .munkicommon import osutils +from .munkicommon import prefs + +from . import FoundationPlist def supports_auth_restart():