From 828d3b38c3e1ff6536f356e1f7cd951efd06998a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tino=20V=C3=A1zquez?= Date: Thu, 23 Feb 2023 19:14:08 +0100 Subject: [PATCH] L #-: Adjust for new rubocop version (cherry picked from commit 2eeea9b80ba896d0b293c49000c93b84e5558b68) --- src/vmm_mad/remotes/lib/lxc/opennebula_vm.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/vmm_mad/remotes/lib/lxc/opennebula_vm.rb b/src/vmm_mad/remotes/lib/lxc/opennebula_vm.rb index fc5f35910c..00da671540 100644 --- a/src/vmm_mad/remotes/lib/lxc/opennebula_vm.rb +++ b/src/vmm_mad/remotes/lib/lxc/opennebula_vm.rb @@ -208,6 +208,7 @@ class LXCVM < OpenNebulaVM @xml.elements('//TEMPLATE/DISK').each do |xml| next if xml['TYPE'].downcase == 'swap' + # rubocop:disable Style/ConditionalAssignment if xml['DISK_ID'] == @rootfs_id adisks << Disk.new_root(xml, @sysds_path, @vm_id, @lxcrc[:mountopts]) @@ -215,6 +216,7 @@ class LXCVM < OpenNebulaVM adisks << Disk.new_disk(xml, @sysds_path, @vm_id, @lxcrc[:mountopts]) end + # rubocop:enable Style/ConditionalAssignment end context_xml = @xml.element('//TEMPLATE/CONTEXT') @@ -271,11 +273,13 @@ class LXCVM < OpenNebulaVM key = match[1].strip value = match[2].strip + # rubocop:disable Style/ConditionalAssignment if !raw_map[key].nil? raw_map[key] = value else raw_map[key] = Array(raw_map[key]) << value end + # rubocop:enable Style/ConditionalAssignment end rescue StandardError end