# HG changeset patch # User Florian Pose # Date 1168350158 0 # Node ID 54787e1b57d416717f8d9c9096c02af9b67a2260 # Parent b6a1426ba724c74855ed442182326c31dde24141 Display requested state in slave info. diff -r b6a1426ba724 -r 54787e1b57d4 master/slave.c --- a/master/slave.c Tue Jan 09 12:56:03 2007 +0000 +++ b/master/slave.c Tue Jan 09 13:42:38 2007 +0000 @@ -632,7 +632,9 @@ off += sprintf(buffer + off, "State: "); off += ec_state_string(slave->current_state, buffer + off); - off += sprintf(buffer + off, "\nFlags: %s, %s\n", + off += sprintf(buffer + off, " ("); + off += ec_state_string(slave->requested_state, buffer + off); + off += sprintf(buffer + off, ")\nFlags: %s, %s\n", slave->online ? "online" : "OFFLINE", slave->error_flag ? "ERROR" : "ok"); off += sprintf(buffer + off, "Ring position: %i\n", diff -r b6a1426ba724 -r 54787e1b57d4 script/lsec.pl --- a/script/lsec.pl Tue Jan 09 12:56:03 2007 +0000 +++ b/script/lsec.pl Tue Jan 09 13:42:38 2007 +0000 @@ -100,7 +100,7 @@ elsif ($line =~ /^Advanced position: (\d+:\d+)$/) { $slave->{'advanced_position'} = $1; } - elsif ($line =~ /^State: (.+)$/) { + elsif ($line =~ /^State: (.+) /) { $slave->{'state'} = $1; } elsif ($line =~ /^Coupler: ([a-z]+)$/) {