From a07a2cf97a31bf364b08d446fd11e901abdb61e1 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Wed, 14 Dec 2022 11:29:38 +0100 Subject: [PATCH] M #-: rsync/stat script to work with all Ruby versions --- src/datastore_mad/remotes/rsync/stat | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/datastore_mad/remotes/rsync/stat b/src/datastore_mad/remotes/rsync/stat index 774659039d..76c3f113d3 100755 --- a/src/datastore_mad/remotes/rsync/stat +++ b/src/datastore_mad/remotes/rsync/stat @@ -107,8 +107,8 @@ end vm = REXML::Document.new(Base64.decode64(rc.stdout)).root -xpath = "/VM/TEMPLATE/DISK[ DISK_ID = #{diskid[1]} ]/SIZE" - +# Done in two steps to support all Ruby versions +xpath = "/VM/TEMPLATE/DISK [ DISK_ID = #{diskid[1]} ]" disk = vm.elements[xpath] if !disk @@ -116,6 +116,13 @@ if !disk exit(1) end -puts disk.text +size = disk.elements['//SIZE'] + +if !size + STDERR.puts "Cannot find size for disk #{diskid[1]} in VM backup info" + exit(1) +end + +puts size.text exit 0