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

Encode ClientIdentifier in UTF-8 before attempting to urllib2.quote() it, to support unicode characters in client id.

Browse Source 
git-svn-id: http://munki.googlecode.com/svn/trunk@942 a4e17f2e-e282-11dd-95e1-755cbddbdd66
This commit is contained in:
Justin McWilliams
2010-11-30 18:22:10 +00:00
parent ffe6722d87
commit 46bbc2d596
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -903,7 +903,7 @@ def getItemDetail(name, cataloglist, vers=''):
def enoughDiskSpace(manifestitem_pl, installlist=None,
uninstalling=False, warn=True):
"""Determine if there is enough disk space to
"""Determine if there is enough disk space to
download the manifestitem."""
# fudgefactor is set to 100MB
fudgefactor = 102400
@@ -1070,7 +1070,7 @@ def evidenceThisIsInstalled(item_pl):
This is used when determining if we can remove the item, thus
the attention given to the uninstall method.
"""
if ('installs' in item_pl and
if ('installs' in item_pl and
item_pl.get('uninstall_method') != 'removepackages'):
installitems = item_pl['installs']
foundallinstallitems = True
@@ -1263,7 +1263,7 @@ def processOptionalInstall(manifestitem, cataloglist, installinfo):
munkicommon.display_debug1(
"* Processing manifest item %s for optional install" %
manifestitemname)
# have we already processed this?
if manifestitemname in installinfo['optional_installs']:
munkicommon.display_debug1(
@@ -1348,7 +1348,7 @@ def processInstall(manifestitem, cataloglist, installinfo):
# have we processed this already?
if manifestitemname in installinfo['processed_installs']:
munkicommon.display_debug1(
'%s has already been processed for install.' %
'%s has already been processed for install.' %
manifestitemname)
return True
elif manifestitemname in installinfo['processed_uninstalls']:
@@ -1622,7 +1622,7 @@ def processRemoval(manifestitem, cataloglist, installinfo):
return True
else:
installinfo['processed_uninstalls'].append(manifestitemname)
infoitems = []
if includedversion:
# a specific version was specified
@@ -2026,8 +2026,8 @@ def getPrimaryManifest(alternate_id):
clientidentifier)
if not manifest:
manifest = getmanifest(manifesturl +
urllib2.quote(clientidentifier))
manifest = getmanifest(
manifesturl + urllib2.quote(clientidentifier.encode('utf-8')))
if manifest:
# record this info for later
munkicommon.report['ManifestName'] = clientidentifier
@@ -2443,7 +2443,7 @@ def check(client_id='', localmanifestpath=None):
installinfo['optional_installs'] = []
installinfo['managed_installs'] = []
installinfo['removals'] = []
munkicommon.display_detail('**Checking for installs**')
processManifestForKey(mainmanifestpath, 'managed_installs',
installinfo)
@@ -2572,7 +2572,7 @@ def check(client_id='', localmanifestpath=None):
installinfo['removals'] = \
[item for item in installinfo['removals']
if item.get('installed')]
munkicommon.report['ManagedInstalls'] = \
installinfo['processed_installs']
munkicommon.report['ManagedUninstalls'] = \