mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-01-27 01:19:12 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into curl-refactor

Browse Source
This commit is contained in:
Greg Neagle
2011-12-21 10:04:27 -08:00
parent 2959be501f f751579404
commit cf31542514
2 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/client/munkilib/munkicommon.py
View File

@@ -263,7 +263,7 @@ def display_percent_done(current, maximum):
else:
percentdone = int(float(current)/float(maximum)*100)
munkistatus.percent(str(percentdone))
elif verbose > 1:
elif verbose > 0:
step = getsteps(16, maximum)
output = ''
indicator = ['\t0', '.', '.', '20', '.', '.', '40', '.', '.',

20
code/client/munkilib/updatecheck.py
View File

@@ -745,10 +745,6 @@ def download_installeritem(item_pl, installinfo, uninstalling=False):
munkicommon.display_detail(
'Downloading %s from %s' % (pkgname, location))
# bump up verboseness so we get download percentage done feedback.
# this is kind of a hack...
oldverbose = munkicommon.verbose
munkicommon.verbose = oldverbose + 1
dl_message = 'Downloading %s...' % pkgname
expected_hash = item_pl.get(item_hash_key, None)
try:
@@ -761,9 +757,6 @@ def download_installeritem(item_pl, installinfo, uninstalling=False):
munkicommon.verbose = oldverbose
raise
# set verboseness back.
munkicommon.verbose = oldverbose
def isItemInInstallInfo(manifestitem_pl, thelist, vers=''):
"""Determines if an item is in a manifest plist.
@@ -2471,8 +2464,9 @@ def curl(url, destinationpath, onlyifnewer=False, etag=None, resume=False,
# Prefer Content-Length header to determine download size,
# otherwise fall back to a custom X-Download-Size header.
# This is primary for servers that use chunked transfer
# encoding, when Content-Length is forbidden by RFC2616 4.4.
# An example of such a server is App Engine Blobstore.
# encoding, when Content-Length is forbidden by
# RFC2616 4.4. An example of such a server is
# Google App Engine Blobstore.
targetsize = (
header.get('content-length') or
header.get('x-download-size'))
@@ -2493,11 +2487,9 @@ def curl(url, destinationpath, onlyifnewer=False, etag=None, resume=False,
if message and header.get('http_result_code') != '304':
if message:
# log always, display if verbose is 2 or more
munkicommon.display_detail(message)
if munkicommon.munkistatusoutput:
# send to detail field on MunkiStatus
munkistatus.detail(message)
# log always, display if verbose is 1 or more
# also display in MunkiStatus detail field
munkicommon.display_status(message)
elif targetsize and header.get('http_result_code').startswith('2'):
# display progress if we get a 2xx result code