From bfed2acd1865e6dc993da13e83a02cebd4e866e7 Mon Sep 17 00:00:00 2001 From: Jay Roebuck Date: Thu, 28 Sep 2023 15:09:17 -0400 Subject: [PATCH] allow non-standard version scheme this will allow a space in the version definition (e.g. "11.2 Beta" becomes "11.2-beta" and is parsed as "11.2.pre.beta" in Gem convention) --- cookbooks/arcgis-enterprise/libraries/datastore_tools.rb | 2 +- cookbooks/arcgis-enterprise/providers/datastore.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cookbooks/arcgis-enterprise/libraries/datastore_tools.rb b/cookbooks/arcgis-enterprise/libraries/datastore_tools.rb index 842e523..f492218 100644 --- a/cookbooks/arcgis-enterprise/libraries/datastore_tools.rb +++ b/cookbooks/arcgis-enterprise/libraries/datastore_tools.rb @@ -87,7 +87,7 @@ def configure_datastore(stores, server_url, username, password, data_dir, mode = # Only add --mode parameter for post 10.8.1 tilecache data stores # if the last known status is not 'Upgrading'. if !mode.nil? && !mode.empty? && - Gem::Version.new(@version) >= Gem::Version.new('10.8.1') && + Gem::Version.new(@version.gsub(/\s+/, '-')) >= Gem::Version.new('10.8.1') && stores.downcase.include?('tilecache') && last_known_status(data_dir) != 'Upgrading' args += " --mode #{mode}" diff --git a/cookbooks/arcgis-enterprise/providers/datastore.rb b/cookbooks/arcgis-enterprise/providers/datastore.rb index bc651e4..8c520b1 100644 --- a/cookbooks/arcgis-enterprise/providers/datastore.rb +++ b/cookbooks/arcgis-enterprise/providers/datastore.rb @@ -404,7 +404,7 @@ # At 10.8 tilecache backup location is no longer registered by default # therefore --operation register needs to be used. - if %w[tilecache spatiotemporal graph].include?(@new_resource.store) && Gem::Version.new(node['arcgis']['version']) >= Gem::Version.new('10.8') + if %w[tilecache spatiotemporal graph].include?(@new_resource.store) && Gem::Version.new(node['arcgis']['version'].gsub(/\s+/, '-')) >= Gem::Version.new('10.8') operation = 'register' end