diff options
| author | John Estabrook <jestabro@vyos.io> | 2023-10-05 12:30:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-05 12:30:32 -0500 |
| commit | af17ef9b1069da7a00b4ed3ef03e7417e95150ec (patch) | |
| tree | 966a9fd0470214d7e0139f0ac5a2377f1088a333 /python | |
| parent | 8dda05009a5ce8379e1f199328c1c2f4f8a1bfbc (diff) | |
| parent | 536e9d0f13f5b0473ee6cf09a00bb2a823414a12 (diff) | |
| download | vyos-1x-af17ef9b1069da7a00b4ed3ef03e7417e95150ec.tar.gz vyos-1x-af17ef9b1069da7a00b4ed3ef03e7417e95150ec.zip | |
Merge pull request #2340 from vyos/mergify/bp/sagitta/pr-2338
T4320: remove references to obsoleted legacy version files (backport #2338)
Diffstat (limited to 'python')
| -rw-r--r-- | python/vyos/component_version.py | 25 | ||||
| -rw-r--r-- | python/vyos/defaults.py | 1 |
2 files changed, 0 insertions, 26 deletions
diff --git a/python/vyos/component_version.py b/python/vyos/component_version.py index 84e0ae51a..9662ebfcf 100644 --- a/python/vyos/component_version.py +++ b/python/vyos/component_version.py @@ -90,31 +90,6 @@ def from_system(): """ return component_version() -def legacy_from_system(): - """ - Get system component version dict from legacy location. - This is for a transitional sanity check; the directory will eventually - be removed. - """ - system_versions = {} - legacy_dir = directories['current'] - - # To be removed: - if not os.path.isdir(legacy_dir): - return system_versions - - try: - version_info = os.listdir(legacy_dir) - except OSError as err: - sys.exit(repr(err)) - - for info in version_info: - if re.match(r'[\w,-]+@\d+', info): - pair = info.split('@') - system_versions[pair[0]] = int(pair[1]) - - return system_versions - def format_string(ver: dict) -> str: """ Version dict to string. diff --git a/python/vyos/defaults.py b/python/vyos/defaults.py index a5314790d..a229533bd 100644 --- a/python/vyos/defaults.py +++ b/python/vyos/defaults.py @@ -24,7 +24,6 @@ directories = { 'op_mode' : f'{base_dir}/op_mode', 'services' : f'{base_dir}/services', 'config' : '/opt/vyatta/etc/config', - 'current' : '/opt/vyatta/etc/config-migrate/current', 'migrate' : '/opt/vyatta/etc/config-migrate/migrate', 'log' : '/var/log/vyatta', 'templates' : '/usr/share/vyos/templates/', |