refactor: make talon's choice of result message easier to read in the code as per Richard's suggestion. fix
authortimothy.murphy@nokia.com
Thu, 25 Mar 2010 11:54:36 +0000
branchfix
changeset 407 bda21097164c
parent 364 f4ccb4c573da
child 408 a819f9223567
refactor: make talon's choice of result message easier to read in the code as per Richard's suggestion.
sbsv2/raptor/util/talon/talon.c
--- a/sbsv2/raptor/util/talon/talon.c	Tue Mar 16 17:04:08 2010 +0000
+++ b/sbsv2/raptor/util/talon/talon.c	Thu Mar 25 11:54:36 2010 +0000
@@ -586,7 +586,7 @@
 
 				if (p->returncode != 0)
 				{
-					char *exitstr = force_success ? "failed" : retries > 0 ? "retry" : "failed";
+					char *exitstr = (force_success || retries <= 0) ? "failed" : "retry";
 					snprintf(status, STATUS_STRMAX - 1, "\n<status exit='%s' code='%d' attempt='%d'%s%s />", exitstr, p->returncode, attempt, flagsstr, reasonstr );
 				} else {
 					snprintf(status, STATUS_STRMAX - 1, "\n<status exit='ok' attempt='%d'%s%s />", attempt, flagsstr, reasonstr );