[lttng-dev] [PATCH lttng-tool] Fix: list command: revert merge error made when adding mi on pretty printing

[David Goulet]

On 12 Aug (13:55:40), Jonathan Rajotte Julien wrote:
> Signed-off-by: Jonathan Rajotte Julien <jonathan.r.julien at gmail.com>
> ---
>  src/bin/lttng/commands/list.c | 8 ++------
>  1 file changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c
> index e3ff4f1..ccffdc7 100644
> --- a/src/bin/lttng/commands/list.c
> +++ b/src/bin/lttng/commands/list.c
> @@ -1271,14 +1271,10 @@ static int list_sessions(const char *session_name)
>  					break;
>  				}
>  			} else {
> -				MSG("  %d) %s (%s) [%s%s]", i + 1,
> -						sessions[i].name, sessions[i].path,
> +				MSG("  %d) %s (%s) [%s%s]", i + 1, sessions[i].name,
> +						sessions[i].path,
>  						active_string(sessions[i].enabled),
>  						snapshot_string(sessions[i].snapshot_mode));
> -				MSG("%sTrace path: %s", indent4, sessions[i].path);
> -				MSG("%sLive timer interval (usec): %u\n", indent4,
> -						sessions[i].live_timer_interval);
> -				break;

Not sure removing that is wanted here. The "trace path" and "live timer
interval" lines are in stable-2.5 thus removing them here, you need a
real good reason ;)

David

>  			}
>  		}
>  
> -- 
> 2.0.4
> 
> 
> _______________________________________________
> lttng-dev mailing list
> lttng-dev at lists.lttng.org
> http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 603 bytes
Desc: Digital signature
URL: <http://lists.lttng.org/pipermail/lttng-dev/attachments/20140816/4183078f/attachment.sig>