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

Patch from rmiddleton for updatecheck.isItemInstallInfo() -- fixes issue with multiple updates with the same name (but different versions) that need to be applied in a single session.

Browse Source
This commit is contained in:
Greg Neagle
2013-03-11 08:18:08 -07:00
parent cce11a4fc0
commit 1ac91e8b44
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/client/munkilib/updatecheck.py
+4 -3
View File
@@ -851,10 +851,11 @@ def isItemInInstallInfo(manifestitem_pl, thelist, vers=''):
if (item['name'] == manifestitem_pl['name']):
if not vers:
return True
if item.get('installed'):
#if the version already installed or processed to be
#installed is the same or greater, then we're good.
if item.get('installed') and (compareVersions(
item.get('installed_version'), vers) in (1, 2)):
return True
#if the version already processed is the same or greater,
#then we're good
if (compareVersions(
item.get('version_to_install'), vers) in (1, 2)):
return True