diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-10-05 08:21:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-05 08:21:03 +0200 |
| commit | df042ef016c9cbf62aa5325ba3c7f8deb515975a (patch) | |
| tree | c94568382cb7e956ad215fc84688470fbfff3a01 /python/vyos | |
| parent | 26b8e8af88dcab4988389afd8bdc4a8ec33f5ffe (diff) | |
| parent | aeb0138c9df73b57489eced152f026c0666d1ee5 (diff) | |
| download | vyos-1x-df042ef016c9cbf62aa5325ba3c7f8deb515975a.tar.gz vyos-1x-df042ef016c9cbf62aa5325ba3c7f8deb515975a.zip | |
Merge pull request #2338 from jestabro/legacy-versions
T4320: remove references to obsoleted legacy version files
Diffstat (limited to 'python/vyos')
| -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/', |