Revert "component_version: T4291: consolidate read/write functions"

This reverts commit 534f677d36285863decb2cdff179687b4fd690cb.
Revert while investigating failure in vyos-configtest.

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)