Fix #406

Merge pull request #412 from simon987/dependabot/npm_and_yarn/sist2-vue/protobufjs-6.11.4
Bump protobufjs from 6.11.3 to 6.11.4 in /sist2-vue
2025-12-18 09:49:06 +00:00 · 2023-08-20 19:53:50 -04:00 · 2023-08-20 19:45:09 -04:00 · 2023-08-19 17:04:47 -04:00 · 2023-08-19 20:09:14 +00:00 · 2023-08-19 16:08:50 -04:00
4 changed files with 11 additions and 10 deletions
--- a/3
+++ b/3
@@ -48,5 +48,6 @@ COPY --from=build /build/build/sist2 /root/sist2
 # sist2-admin
 WORKDIR /root/sist2-admin
 COPY sist2-admin/requirements.txt /root/sist2-admin/
-RUN python3 -m pip install --no-cache -r /root/sist2-admin/requirements.txt
+RUN ln /usr/bin/python3 /usr/bin/python
+RUN python -m pip install --no-cache -r /root/sist2-admin/requirements.txt
 COPY --from=build /build/sist2-admin/ /root/sist2-admin/
--- a/sist2-vue/package-lock.json
+++ b/sist2-vue/package-lock.json
@@ -9431,9 +9431,9 @@
      "dev": true
    },
    "node_modules/protobufjs": {
-      "version": "6.11.3",
-      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.3.tgz",
-      "integrity": "sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg==",
+      "version": "6.11.4",
+      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.4.tgz",
+      "integrity": "sha512-5kQWPaJHi1WoCpjTGszzQ32PG2F4+wRY6BmAT4Vfw56Q2FZ4YZzK20xUYQH4YkfehY1e6QSICrJquM6xXZNcrw==",
      "hasInstallScript": true,
      "dependencies": {
        "@protobufjs/aspromise": "^1.1.2",
@@ -18886,9 +18886,9 @@
      "dev": true
    },
    "protobufjs": {
-      "version": "6.11.3",
-      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.3.tgz",
-      "integrity": "sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg==",
+      "version": "6.11.4",
+      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.4.tgz",
+      "integrity": "sha512-5kQWPaJHi1WoCpjTGszzQ32PG2F4+wRY6BmAT4Vfw56Q2FZ4YZzK20xUYQH4YkfehY1e6QSICrJquM6xXZNcrw==",
      "requires": {
        "@protobufjs/aspromise": "^1.1.2",
        "@protobufjs/base64": "^1.1.2",
--- a/src/database/database.c
+++ b/src/database/database.c
@@ -591,7 +591,7 @@ cJSON *database_incremental_scan_end(database_t *db) {

    CRASH_IF_NOT_SQLITE_OK(sqlite3_exec(
            db->db,
-            "INSERT INTO delete_list (id) SELECT id FROM document WHERE marked=0;",
+            "INSERT INTO delete_list (id) SELECT id FROM document WHERE marked=0 ON CONFLICT DO NOTHING;",
            NULL, NULL, NULL
    ));

--- a/src/sist.h
+++ b/src/sist.h
@@ -51,11 +51,11 @@
 #include <ctype.h>
 #include "git_hash.h"

-#define VERSION "3.2.0"
+#define VERSION "3.2.1"
 static const char *const Version = VERSION;
 static const int VersionMajor = 3;
 static const int VersionMinor = 2;
-static const int VersionPatch = 0;
+static const int VersionPatch = 1;

 #ifndef SIST_PLATFORM
 #define SIST_PLATFORM unknown
Author	SHA1	Message	Date
simon987	b81ccebdb1	Fix #406	2023-08-20 19:53:50 -04:00
simon987	b2d214a19a	Merge pull request #412 from simon987/dependabot/npm_and_yarn/sist2-vue/protobufjs-6.11.4 Bump protobufjs from 6.11.3 to 6.11.4 in /sist2-vue	2023-08-20 19:45:09 -04:00
simon987	69438464bf	Fix python path for user scripts	2023-08-19 17:04:47 -04:00
dependabot[bot]	aa60b526f4	Bump protobufjs from 6.11.3 to 6.11.4 in /sist2-vue Bumps [protobufjs](https://github.com/protobufjs/protobuf.js) from 6.11.3 to 6.11.4. - [Release notes](https://github.com/protobufjs/protobuf.js/releases) - [Changelog](https://github.com/protobufjs/protobuf.js/blob/master/CHANGELOG.md) - [Commits](https://github.com/protobufjs/protobuf.js/commits) --- updated-dependencies: - dependency-name: protobufjs dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2023-08-19 20:09:14 +00:00
simon987	2ea8b51b34	Merge pull request #411 from simon987/embeddings rework user scripts, add support for embedding search	2023-08-19 16:08:50 -04:00