Merge 4ec6a14252 into 670dad185e

Added the version badge-pill to the sist2-admin page so you can check the version without going to the main search frontend.

CMakeLists.txt

@@ -89,7 +89,7 @@ target_include_directories(
 target_compile_options(
         sist2
         PRIVATE
-#        -fPIC
+        -fPIC
 )
 
 if (SIST_DEBUG)
@@ -147,7 +147,7 @@ add_dependencies(
 target_link_libraries(
         sist2
 
-#        m
+        m
         z
         argparse
         unofficial::mongoose::mongoose

sist2-admin/frontend/src/components/NavBar.vue

@@ -4,6 +4,10 @@
       <Sist2Icon></Sist2Icon>
     </b-navbar-brand>
     
+    <span class="badge badge-pill version" v-if="$store && $store.state.sist2Info">
+      v{{ sist2Version() }}
+    </span>
+      
     <b-button class="ml-auto" to="/task" variant="link">{{ $t("tasks") }}</b-button>
   </b-navbar>
 </template>

sist2-admin/sist2_admin/jobs.py

@@ -220,7 +220,7 @@ class Sist2IndexTask(Sist2Task):
             except ProcessLookupError:
                 pass
             try:
-                os.waitpid(pid, 0)
+                os.wait()
             except ChildProcessError:
                 pass
 

src/sist.h

@@ -55,7 +55,7 @@
 static const char *const Version = VERSION;
 static const int VersionMajor = 3;
 static const int VersionMinor = 4;
-static const int VersionPatch = 4;
+static const int VersionPatch = 3;
 
 #ifndef SIST_PLATFORM
 #define SIST_PLATFORM unknown