Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/autopkg/autopkg into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
nmcspadden committed Aug 14, 2023
2 parents d91b130 + 0048c77 commit 40b4d7f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
4 changes: 3 additions & 1 deletion Code/autopkglib/Installer.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,9 @@ def connect(self):
self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
self.socket.connect(AUTOPKGINSTALLD_SOCKET)
except OSError as err:
raise ProcessorError(f"Couldn't connect to autopkginstalld: {err.strerror}") from err
raise ProcessorError(
f"Couldn't connect to autopkginstalld: {err.strerror}"
) from err

def send_request(self, request):
"""Send an install request to autopkginstalld"""
Expand Down
4 changes: 3 additions & 1 deletion Code/autopkglib/StopProcessingIf.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ def predicate_evaluates_as_true(self, predicate_string):
try:
predicate = NSPredicate.predicateWithFormat_(predicate_string)
except Exception as err:
raise ProcessorError(f"Predicate error for '{predicate_string}': {err}") from err
raise ProcessorError(
f"Predicate error for '{predicate_string}': {err}"
) from err

result = predicate.evaluateWithObject_(self.env)
self.output(f"({predicate_string}) is {result}")
Expand Down
4 changes: 3 additions & 1 deletion Code/autopkglib/URLDownloader.py
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,9 @@ def get_download_dir(self):
try:
os.makedirs(download_dir)
except OSError as err:
raise ProcessorError(f"Can't create {download_dir}: {err.strerror}") from err
raise ProcessorError(
f"Can't create {download_dir}: {err.strerror}"
) from err
return download_dir

def create_temp_file(self, download_dir):
Expand Down

0 comments on commit 40b4d7f

Please sign in to comment.