[libvirt] [PATCH 4/5]virsh: If VSH_OFLAG_IGNORE set, don't auto complete it in virsh

[Michal Privoznik]

On 18.10.2013 07:42, Chen Hanxiao wrote:
> From: Chen Hanxiao <chenhanxiao at cn.fujitsu.com>
> 
> If VSH_OFLAG_IGNORE set, don't auto complete in virsh.
> 
> Signed-off-by: Chen Hanxiao <chenhanxiao at cn.fujitsu.com>
> ---
>  tools/virsh.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/tools/virsh.c b/tools/virsh.c
> index f772794..42d79f1 100644
> --- a/tools/virsh.c
> +++ b/tools/virsh.c
> @@ -2677,6 +2677,9 @@ vshReadlineOptionsGenerator(const char *text, int state)
>              /* ignore non --option */
>              continue;
>  
> +        if (opt->flags & VSH_OFLAG_IGNORE)
> +            continue;
> +
>          if (len > 2) {
>              if (STRNEQLEN(name, text + 2, len - 2))
>                  continue;
> 

These three (2/5 3/5 and 4/5) could have been merged into a single
patch. In fact, I think they *have to* be merged, otherwise we may end
up with broken backports (due to incomplete functionality being backported).

Michal