mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-04-24 22:08:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Address issue #764 -- warning when icons are in subdirectory of icons dir.

Browse Source
This commit is contained in:
Greg Neagle
2017-05-04 10:22:19 -07:00
parent 0d121949b6
commit dbf85e79c6
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/client/makecatalogs
+3 -4
View File
@@ -64,8 +64,7 @@ def makecatalogs(repo, options):
# Try to read the icon file
try:
icondata = repo.get(icon_ref)
icons[os.path.basename(icon_ref)] = hashlib.sha256(
icondata).hexdigest()
icons[icon_ref] = hashlib.sha256(icondata).hexdigest()
except munkirepo.RepoError, err:
errors.append('RepoError for %s: %s' % (icon_ref, unicode(err)))
exit_code = -1
@@ -129,8 +128,8 @@ def makecatalogs(repo, options):
if iconhashing:
name = pkginfo.get('name')
if pkginfo.get('icon_name'):
iconhash = (icons.get(pkginfo['icon_name']) or
icons.get(pkginfo['icon_name'] + '.png'))
iconhash = (icons.get('icons/' + pkginfo['icon_name']) or
icons.get('icons/' + pkginfo['icon_name'] + '.png'))
if not iconhash:
errors.append(
"WARNING: icon_name specified in %s but it does not "