[Pkg-libvirt-commits] [libguestfs] 92/179: p2v: Test did not recognize '1.XX.0' as a valid version number.

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch experimental
in repository libguestfs.

commit 93f8b522aa06e4ca7bc22fa40928ce38c6ece6ad
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Sat Oct 18 10:27:23 2014 +0100

    p2v: Test did not recognize '1.XX.0' as a valid version number.
    
    Thus breaking when we changed the version number to 1.28.0.
    
    (cherry picked from commit 1f97a5df7673aa3a6e4208a421a87fd14369675c)
---
 p2v/ssh.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/p2v/ssh.c b/p2v/ssh.c
index 7b6786f..f3bfcf9 100644
--- a/p2v/ssh.c
+++ b/p2v/ssh.c
@@ -126,7 +126,7 @@ compile_regexps (void)
    */
   COMPILE (prompt_re, "###([0123456789abcdefghijklmnopqrstuvwxyz]{8})### ", 0);
   COMPILE (version_re,
-           "virt-v2v ([1-9]\\d*)\\.([1-9]\\d*)\\.([1-9]\\d*)", 0);
+           "virt-v2v ([1-9]\\d*)\\.([1-9]\\d*)\\.(0|[1-9]\\d*)", 0);
   COMPILE (feature_libguestfs_rewrite_re, "libguestfs-rewrite", 0);
   COMPILE (feature_input_re, "input:(\\w*)", 0);
   COMPILE (feature_output_re, "output:(\\w*)", 0);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git