Skip to content

Commit

Permalink
squash w/ downgrade python script logic. Remove TODO for .dist files.…
Browse files Browse the repository at this point in the history
… There will always be only one .dist file present in the home directory.
  • Loading branch information
korydraughn committed Nov 7, 2024
1 parent cdb6965 commit 092ed28
Showing 1 changed file with 0 additions and 21 deletions.
21 changes: 0 additions & 21 deletions scripts/irods/upgrade_configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,27 +63,6 @@ def raise_exception_if_downgrade_is_detected(irods_config):

l.debug('Found [%s].', version_file_path_previous)

# TODO Remove this block since it doesn't make since for iRODS 5.
# There will never be a case where old ".dist" files exist during an upgrade.
"""
# At this point, we know iRODS exists on this computer. Look for a ".dist" file.
# Start with the latest form of the file and work backwards based on iRODS
# versions.
version_file_path_dist = None
version_file_paths = [
paths.version_path() + '.dist', # >= 4.3.x
os.path.join(paths.irods_directory(), 'VERSION.json.dist'), # >= 4.1.x
os.path.join(paths.irods_directory(), 'VERSION') # < 4.1.x
]
for path in version_file_paths:
l.debug('Checking if [%s] exists.', path)
if os.path.exists(path):
version_file_path_dist = path
break
if version_file_path_dist is None:
raise IrodsError(f'Version file does not exist. Please check your installation or reinstall.')
"""
# At this point, we know a previous version of iRODS existed on this computer.
# Look for the new ".dist" file.
version_file_path_dist = paths.version_path() + '.dist'
Expand Down

0 comments on commit 092ed28

Please sign in to comment.