On Tuesday, 12 June 2018 11:27:56 CEST Richard W.M. Jones wrote: > The new ‘-o rhv-upload’ output mode contains a '-' character in the > name, but the regular expression which matched the output of the > virt-v2v command did not recognize '-' as a valid character. It ended > up mapping this to just "rhv" meaning two "rhv" entries would appear > in the list of output drivers. > > Thanks: Ming Xie. > --- > p2v/ssh.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/p2v/ssh.c b/p2v/ssh.c > index d2699fffd..2fcf0ef3e 100644 > --- a/p2v/ssh.c > +++ b/p2v/ssh.c > @@ -181,8 +181,8 @@ compile_regexps (void) > 0); > COMPILE (feature_libguestfs_rewrite_re, "libguestfs-rewrite", 0); > COMPILE (feature_colours_option_re, "colours-option", 0); > - COMPILE (feature_input_re, "input:((?:\\w)*)", 0); > - COMPILE (feature_output_re, "output:((?:\\w)*)", 0); > + COMPILE (feature_input_re, "input:((?:[-\\w])*)", 0); > + COMPILE (feature_output_re, "output:((?:[-\\w])*)", 0);
What about making them a bit more loose, e.g.: input:((?:[^\\n])+) so there are no further changes to do, in case other non-word characters are used in the names of input, and output modes? -- Pino Toscano
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ Libguestfs mailing list [email protected] https://www.redhat.com/mailman/listinfo/libguestfs
