Skip to content

allow non-standard version scheme #370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+2 −2
Open

allow non-standard version scheme #370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfed2ac
allow non-standard version scheme
jtroe Sep 28, 2023
c38a9ce
Merge branch 'Esri:main' into jtroe/datastore-version
jtroe Feb 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cookbooks/arcgis-enterprise/libraries/datastore_tools.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def configure_datastore(stores, server_url, username, password, data_dir, mode =
# Add --mode parameter for post 10.8.1 tilecache and object 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}"
Expand Down
2 changes: 1 addition & 1 deletion cookbooks/arcgis-enterprise/providers/datastore.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down