Fix for updatecheck logic when multiple items to be installed require the same non-existent package.

git-svn-id: http://munki.googlecode.com/svn/trunk@1267 a4e17f2e-e282-11dd-95e1-755cbddbdd66
This commit is contained in:
Greg Neagle
2011-08-03 20:24:42 +00:00
parent 1b91dfd626
commit e0d43c410e
+8 -6
View File
@@ -1464,12 +1464,6 @@ def processInstall(manifestitem, cataloglist, installinfo):
('Will not process %s for install because it has already '
'been processed for uninstall!') % manifestitemname)
return False
elif manifestitemname in installinfo['managed_updates']:
# we're processing this as a managed update, so don't
# add it to the processed_installs list
pass
else:
installinfo['processed_installs'].append(manifestitemname)
item_pl = getItemDetail(manifestitem, cataloglist)
if not item_pl:
@@ -1479,6 +1473,14 @@ def processInstall(manifestitem, cataloglist, installinfo):
'No pkginfo for %s found in catalogs: %s' %
(manifestitem, ', '.join(cataloglist)))
return False
elif manifestitemname in installinfo['managed_updates']:
# we're processing this as a managed update, so don't
# add it to the processed_installs list
pass
else:
# we found it, so add it to our list of procssed installs
# so we don't process it again in the future
installinfo['processed_installs'].append(manifestitemname)
if isItemInInstallInfo(item_pl, installinfo['managed_installs'],
vers=item_pl.get('version')):