startup checks: show libcacard version too

1 files changed, 15 insertions, 3 deletions

diff --git a/spice2 b/spice2
index 2ea73e0..e05ec07 100755
--- a/spice2
+++ b/spice2
@@ -238,14 +238,26 @@ def make_iso(iso_name, root, title):
     print cmd
     os.system(cmd)
 
-def print_qemu_and_spice_versions(which, qemuexe, bios_dir):
+def version_tuple(symbol):
+    return tuple(map(int, symbol.strip().rsplit('_', 1)[1].split('.')))
+
+def get_versioned_library_version(lib, version_prefix):
+    return max([version_tuple(l) for l in os.popen('nm %s' % lib).readlines()
+               if version_prefix in l])
+
+def print_qemu_and_spice_versions(which, qemuexe, clientexe, bios_dir):
     base = which + ' '
-    spice_lib = get_lib(qemuexe, 'libspice-server.*')
     bios_bin = os.path.join(bios_dir, 'bios.bin')
     print red % (base * (80 / len(base)))
     print "QEMU age: %s (%s)" % (oldness(qemuexe), qemuexe)
-    print "spice age: %s (%s)" % (oldness(spice_lib), spice_lib)
     print "bios.bin age: %s (%s)" % (oldness(bios_bin), bios_dir)
+    for exe, lib_name, version_prefix in [
+        (qemuexe, 'spice-server', 'SPICE_SERVER'),
+        (clientexe, 'cacard', 'CACARD')]:
+        lib = get_lib(exe, 'lib%s.*' % lib_name)
+        print "%s age: %s (%s)" % (lib_name, oldness(lib), lib)
+        print "%s version: %r" % (lib_name,
+            get_versioned_library_version(lib, version_prefix))
     print red % (base * (80 / len(base)))
 
 def get_temp_name(prefix, postfix):