mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-05-02 10:19:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Updated method by which icon_name is set for items with version names that includes periods (SomeApp5.5)

Browse Source
This commit is contained in:
Pepijn Bruienne
2014-07-22 21:22:45 -04:00
committed by Greg Neagle
parent c205e678e2
commit ae5f9b4c75
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/client/munkilib/updatecheck.py
+2 -2
View File
@@ -2725,6 +2725,7 @@ def download_icons(item_list):
'''Attempts to download icons (actually png files) for items in
item_list'''
icon_list = []
icon_known_exts = [ 'bmp', 'gif', 'icns', 'jpg', 'jpeg', 'png', 'psd', 'tga', 'tif', 'tiff', 'yuv' ]
icon_base_url = (munkicommon.pref('IconURL') or
munkicommon.pref('SoftwareRepoURL') + '/icons/')
icon_base_url = icon_base_url.rstrip('/') + '/'
@@ -2732,7 +2733,7 @@ def download_icons(item_list):
munkicommon.display_debug2('Icon base URL is: %s', icon_base_url)
for item in item_list:
icon_name = item.get('icon_name') or item['name']
if not os.path.splitext(icon_name)[1]:
if not [ ext for ext in icon_known_exts if ext in icon_name ]:
icon_name += '.png'
icon_list.append(icon_name)
icon_url = icon_base_url + urllib2.quote(icon_name)
@@ -3435,4 +3436,3 @@ def main():
if __name__ == '__main__':
main()