From 3de71881ce2a89769dbd6814a4192635d1a334b7 Mon Sep 17 00:00:00 2001
From: onenhansen <92747003+onenhansen@users.noreply.github.com>
Date: Mon, 11 Jul 2022 02:02:47 -0600
Subject: [PATCH] F #5818: Fixing case where no images exist in datastore
 (#2227)

(cherry picked from commit 94865d2dd7ef3e3d37870644fd7c06f198e713af)
---
 src/oca/ruby/opennebula/marketplaceapp_ext.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/oca/ruby/opennebula/marketplaceapp_ext.rb b/src/oca/ruby/opennebula/marketplaceapp_ext.rb
index 6c341e975f..7b8046c405 100644
--- a/src/oca/ruby/opennebula/marketplaceapp_ext.rb
+++ b/src/oca/ruby/opennebula/marketplaceapp_ext.rb
@@ -604,6 +604,7 @@ module OpenNebula::MarketPlaceAppExt
                 exported = {}
                 idx      = 0
                 idy      = 0
+                opt_name = ''
 
                 # Store IDs of created resources
                 images    = []
@@ -634,8 +635,9 @@ module OpenNebula::MarketPlaceAppExt
                     img_names = imgp.retrieve_elements('/IMAGE_POOL/IMAGE/NAME')
 
                     opt_name = options[:name]
+                    t_short = "#{opt_name}-#{obj_name}-#{idx}"
 
-                    if img_names.include? "#{opt_name}-#{obj_name}-#{idx}"
+                    if !img_names.nil? && img_names.include?(t_short)
                         idy = 0
                         while img_names.include? \
                             "#{opt_name}_#{idy}-#{obj_name}-#{idx}"