From bdd325a6f87a727476f962acbb2a6e45a8b68f8e Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Thu, 7 May 2020 17:53:35 +0200 Subject: [PATCH] M #-: Improve version parser for qemu-nbd --- src/vmm_mad/remotes/lib/lxd/mapper/qcow2.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/vmm_mad/remotes/lib/lxd/mapper/qcow2.rb b/src/vmm_mad/remotes/lib/lxd/mapper/qcow2.rb index a440d2fe31..1e3d31a49a 100644 --- a/src/vmm_mad/remotes/lib/lxd/mapper/qcow2.rb +++ b/src/vmm_mad/remotes/lib/lxd/mapper/qcow2.rb @@ -85,8 +85,7 @@ class Qcow2Mapper < Mapper return "0.0.0" unless rc.zero? - match_v = out.match(/qemu-nbd ((?:[0-9]+\.?)+) \(/) - match_v = out.match(/qemu-nbd version (.*)$/) if match_v.nil? + match_v = out.match(/qemu-nbd(?: version)? ((?:[0-9]+\.?)+)\s?\(?.*$/) return "0.0.0" if match_v.nil?