From 092ed288552b0ffc42da79d111a4b55e8a02fbbf Mon Sep 17 00:00:00 2001 From: Kory Draughn Date: Thu, 7 Nov 2024 12:55:22 -0500 Subject: [PATCH] squash w/ downgrade python script logic. Remove TODO for .dist files. There will always be only one .dist file present in the home directory. --- scripts/irods/upgrade_configuration.py | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/scripts/irods/upgrade_configuration.py b/scripts/irods/upgrade_configuration.py index 7f9a5cead4..3430f077e0 100644 --- a/scripts/irods/upgrade_configuration.py +++ b/scripts/irods/upgrade_configuration.py @@ -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'