mirror of
https://github.com/munki/munki.git
synced 2026-05-25 15:48:42 -05:00
Merge branch 'master' of https://code.google.com/p/munki
This commit is contained in:
@@ -880,6 +880,7 @@ class AppleUpdates(object):
|
||||
results['installed'] = []
|
||||
results['download'] = []
|
||||
|
||||
last_output = None
|
||||
while True:
|
||||
if stop_allowed and munkicommon.stopRequested():
|
||||
job.stop()
|
||||
@@ -895,6 +896,12 @@ class AppleUpdates(object):
|
||||
time.sleep(1)
|
||||
continue
|
||||
|
||||
# Don't bother parsing the stdout output if it hasn't changed since
|
||||
# the last loop iteration.
|
||||
if last_output == output:
|
||||
continue
|
||||
last_output = output
|
||||
|
||||
output = output.decode('UTF-8').strip()
|
||||
# send the output to STDOUT or MunkiStatus as applicable
|
||||
if output.startswith('Progress: '):
|
||||
|
||||
Reference in New Issue
Block a user