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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Pepijn Bruienne
2016-03-17 14:07:20 -04:00
parent 180065faff 20cf3bddaa
commit 55936d96ed
80 changed files with 483 additions and 1642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
#!/usr/bin/python
# encoding: utf-8
#
# Copyright 2009-2014 Greg Neagle.
# Copyright 2009-2016 Greg Neagle.
#
# Licensed under the Apache License, Version 2.0 (the 'License');
# you may not use this file except in compliance with the License.
@@ -1467,7 +1467,7 @@ def lookForUpdates(itemname, cataloglist):
update_list = []
for catalogname in cataloglist:
if not catalogname in CATALOG.keys():
# in case the list refers to a non-existant catalog
# in case the list refers to a non-existent catalog
continue
updaters = CATALOG[catalogname]['updaters']
@@ -1925,7 +1925,7 @@ def processInstall(manifestitem, cataloglist, installinfo):
iteminfo[key] = item_pl[key]
if not 'apple_item' in iteminfo:
# admin did not explictly mark this item; let's determine if
# admin did not explicitly mark this item; let's determine if
# it's from Apple
if isAppleItem(item_pl):
munkicommon.log("Marking %s as apple_item - this may affect \
@@ -2370,7 +2370,7 @@ def processRemoval(manifestitem, cataloglist, installinfo):
iteminfo[key] = uninstall_item[key]
if not 'apple_item' in iteminfo:
# admin did not explictly mark this item; let's determine if
# admin did not explicitly mark this item; let's determine if
# it's from Apple
if isAppleItem(item_pl):
iteminfo['apple_item'] = True
@@ -2892,7 +2892,7 @@ def download_icons(item_list):
def download_client_resources():
"""Download client customization resources (if any)."""
# Munki's preferences can specify an explict name
# Munki's preferences can specify an explicit name
# under ClientResourcesFilename
# if that doesn't exist, use the primary manifest name as the
# filename. If that fails, try site_default.zip