summaryrefslogtreecommitdiff
path: root/src/helpers/system-versions-foot.py
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2022-03-10 10:07:31 -0600
committerJohn Estabrook <jestabro@vyos.io>2022-03-10 12:11:07 -0600
commitc1e04cea0817db07b22a8bd8e6b2f2c0a1e682f4 (patch)
tree3f238ec7e17d3ae895b8db1093c608ee488bc6e1 /src/helpers/system-versions-foot.py
parentef4870e66f8c1cd6df5fba2abbfdde0eac152e0a (diff)
downloadvyos-1x-c1e04cea0817db07b22a8bd8e6b2f2c0a1e682f4.tar.gz
vyos-1x-c1e04cea0817db07b22a8bd8e6b2f2c0a1e682f4.zip
Revert "component_version: T4291: consolidate read/write functions"
This reverts commit 534f677d36285863decb2cdff179687b4fd690cb. Revert while investigating failure in vyos-configtest.
Diffstat (limited to 'src/helpers/system-versions-foot.py')
-rwxr-xr-xsrc/helpers/system-versions-foot.py19
1 files changed, 15 insertions, 4 deletions
diff --git a/src/helpers/system-versions-foot.py b/src/helpers/system-versions-foot.py
index b44408542..2aa687221 100755
--- a/src/helpers/system-versions-foot.py
+++ b/src/helpers/system-versions-foot.py
@@ -16,13 +16,24 @@
# along with this library. If not, see <http://www.gnu.org/licenses/>.
import sys
+import vyos.formatversions as formatversions
+import vyos.systemversions as systemversions
import vyos.defaults
-from vyos.component_version import write_footer
+import vyos.version
+
+sys_versions = systemversions.get_system_component_version()
+
+component_string = formatversions.format_versions_string(sys_versions)
+
+os_version_string = vyos.version.get_version()
sys.stdout.write("\n\n")
if vyos.defaults.cfg_vintage == 'vyos':
- write_footer(None, vintage='vyos')
+ formatversions.write_vyos_versions_foot(None, component_string,
+ os_version_string)
elif vyos.defaults.cfg_vintage == 'vyatta':
- write_footer(None, vintage='vyatta')
+ formatversions.write_vyatta_versions_foot(None, component_string,
+ os_version_string)
else:
- write_footer(None, vintage='vyatta')
+ formatversions.write_vyatta_versions_foot(None, component_string,
+ os_version_string)