Skip to content

Commit bfed2ac

Browse files
committed
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)
1 parent b6eba15 commit bfed2ac

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

cookbooks/arcgis-enterprise/libraries/datastore_tools.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ def configure_datastore(stores, server_url, username, password, data_dir, mode =
8787
# Only add --mode parameter for post 10.8.1 tilecache data stores
8888
# if the last known status is not 'Upgrading'.
8989
if !mode.nil? && !mode.empty? &&
90-
Gem::Version.new(@version) >= Gem::Version.new('10.8.1') &&
90+
Gem::Version.new(@version.gsub(/\s+/, '-')) >= Gem::Version.new('10.8.1') &&
9191
stores.downcase.include?('tilecache') &&
9292
last_known_status(data_dir) != 'Upgrading'
9393
args += " --mode #{mode}"

cookbooks/arcgis-enterprise/providers/datastore.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@
404404

405405
# At 10.8 tilecache backup location is no longer registered by default
406406
# therefore --operation register needs to be used.
407-
if %w[tilecache spatiotemporal graph].include?(@new_resource.store) && Gem::Version.new(node['arcgis']['version']) >= Gem::Version.new('10.8')
407+
if %w[tilecache spatiotemporal graph].include?(@new_resource.store) && Gem::Version.new(node['arcgis']['version'].gsub(/\s+/, '-')) >= Gem::Version.new('10.8')
408408
operation = 'register'
409409
end
410410

0 commit comments

Comments
 (0)