mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-04-29 17:00:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Do not attempt to convert items to strings before sending them to munkicommon.display_* functions; let those functions do the proper conversions. Addresses unicode issues.

Browse Source
This commit is contained in:
Greg Neagle
2016-03-18 11:14:00 -07:00
parent a871a97c80
commit 7f27114fcb
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/client/munkilib/appleupdates.py
+6 -6
View File
@@ -721,7 +721,7 @@ class AppleUpdates(object):
try:
catalog_url = self._GetAppleCatalogURL()
except CatalogNotFoundError as err:
munkicommon.display_error(str(err))
munkicommon.display_error(err)
raise
if not os.path.exists(self.temp_cache_dir):
try:
@@ -807,7 +807,7 @@ class AppleUpdates(object):
except (ReplicationError, fetch.MunkiDownloadError) as err:
munkicommon.display_warning(
'Could not download Apple SUS catalog:')
munkicommon.display_warning('\t%s', str(err))
munkicommon.display_warning('\t%s', err)
return False
if not force_check and not self._IsForceCheckNeccessary(before_hash):
@@ -835,7 +835,7 @@ class AppleUpdates(object):
except ReplicationError as err:
munkicommon.display_warning(
'Could not replicate software update metadata:')
munkicommon.display_warning('\t%s', str(err))
munkicommon.display_warning('\t%s', err)
return False
if munkicommon.stopRequested():
return False
@@ -1131,7 +1131,7 @@ class AppleUpdates(object):
os.chmod(softwareupdateappbin, 0)
except OSError as err:
munkicommon.display_warning(
'Error with os.stat(Softare Update.app): %s', str(err))
'Error with os.stat(Softare Update.app): %s', err)
munkicommon.display_warning('Skipping Apple SUS check.')
return -2
@@ -1253,14 +1253,14 @@ class AppleUpdates(object):
cmd.extend(options_list)
munkicommon.display_debug1('softwareupdate cmd: %s', str(cmd))
munkicommon.display_debug1('softwareupdate cmd: %s', cmd)
try:
job = launchd.Job(cmd)
job.start()
except launchd.LaunchdJobException as err:
munkicommon.display_warning(
'Error with launchd job (%s): %s', cmd, str(err))
'Error with launchd job (%s): %s', cmd, err)
munkicommon.display_warning('Skipping softwareupdate run.')
return -3