Minor output tweak in log info for dependencies.

git-svn-id: http://munki.googlecode.com/svn/trunk@256 a4e17f2e-e282-11dd-95e1-755cbddbdd66
This commit is contained in:
Greg Neagle
2009-10-13 23:33:20 +00:00
parent 28da312e9a
commit 4dc3cc93cb
+2 -2
View File
@@ -956,7 +956,7 @@ def processInstall(manifestitem, cataloglist, installinfo):
if 'requires' in pl:
dependencies = pl['requires']
for item in dependencies:
munkicommon.display_detail("%s requires %s. Getting info on %s..." % (manifestitemname, item, item))
munkicommon.display_detail("%s-%s requires %s. Getting info on %s..." % (pl.get('name', manifestitemname), pl.get('version',''), item, item))
success = processInstall(item, cataloglist, installinfo)
if not success:
dependenciesMet = False
@@ -970,7 +970,7 @@ def processInstall(manifestitem, cataloglist, installinfo):
else:
item = dependencies
munkicommon.display_detail("%s modifies %s. Getting info on %s..." % (manifestitemname, item, item))
munkicommon.display_detail("%s-%s modifies %s. Getting info on %s..." % (pl.get('name', manifestitemname), pl.get('version',''), item, item))
success = processInstall(item, cataloglist, installinfo)
if not success:
dependenciesMet = False