summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSol Jerome <solj@ices.utexas.edu>2009-03-23 16:08:53 +0000
committerSol Jerome <solj@ices.utexas.edu>2009-03-23 16:08:53 +0000
commit16a58d447ba102088f6bf62217202200bf2b2113 (patch)
treef5bcc5d355ad473d2f98e5d947bfd6b1dfe86f4b
parent0f14d54f6a493fb398ff5c2e40fd898b64afc02c (diff)
downloadbcfg2-16a58d447ba102088f6bf62217202200bf2b2113.tar.gz
bcfg2-16a58d447ba102088f6bf62217202200bf2b2113.tar.bz2
bcfg2-16a58d447ba102088f6bf62217202200bf2b2113.zip
Clarify priority conflict error message
Signed-off-by: Sol Jerome <solj@ices.utexas.edu> git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5140 ce84e21b-d406-0410-9b95-82705330c041
-rw-r--r--src/lib/Server/Plugin.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/Server/Plugin.py b/src/lib/Server/Plugin.py
index a9c2c303e..f88f10de5 100644
--- a/src/lib/Server/Plugin.py
+++ b/src/lib/Server/Plugin.py
@@ -442,10 +442,12 @@ class PrioDir(Plugin, Generator, XMLDirectoryBacked):
else:
prio = [int(src.priority) for src in matching]
if prio.count(max(prio)) > 1:
- self.logger.error("Found conflicting %s sources with same priority for %s, pkg %s" %
- (entry.tag.lower(), metadata.hostname, entry.get('name')))
+ self.logger.error("Found conflicting sources with "
+ "same priority for %s, %s %s" %
+ (metadata.hostname,
+ entry.tag.lower(), entry.get('name')))
self.logger.error([item.name for item in matching])
- self.logger.error("Prio was %s" % max(prio))
+ self.logger.error("Priority was %s" % max(prio))
raise PluginExecutionError
index = prio.index(max(prio))