diff options
| author |  grunfink | 2026-02-07 16:59:53 +0100 |
|---|---|---|
| committer | grunfink | 2026-02-07 16:59:53 +0100 |
| commit | 4087e740711303d410fa4c3a275fa69e8c605940 (patch) | |
| tree | 061e941dcbcf45d7f4542d993c0e367d74c38201 /data.c | |
| parent | Updated RELEASE_NOTES. (diff) | |
| parent | Merge pull request 'strip_exif support for the OpenBSD sandbox' (#548) from o... (diff) | |
| download | snac2-4087e740711303d410fa4c3a275fa69e8c605940.tar.gz snac2-4087e740711303d410fa4c3a275fa69e8c605940.tar.xz snac2-4087e740711303d410fa4c3a275fa69e8c605940.zip | |
Merge branch 'master' of grunfink-codeberg:grunfink/snac2
Diffstat (limited to 'data.c')
| -rw-r--r-- | data.c | 19 |
1 files changed, 6 insertions, 13 deletions
| @@ -100,19 +100,12 @@ int srv_open(const char *basedir, int auto_upgrade) | |||
| 100 | 100 | ||
| 101 | if (auto_upgrade) | 101 | if (auto_upgrade) |
| 102 | ret = snac_upgrade(&error); | 102 | ret = snac_upgrade(&error); |
| 103 | else { | 103 | else if (xs_number_get(xs_dict_get(srv_config, "layout")) < disk_layout) |
| 104 | if (xs_number_get(xs_dict_get(srv_config, "layout")) < disk_layout) | 104 | error = xs_fmt("ERROR: disk layout changed - execute 'snac upgrade' first"); |
| 105 | error = xs_fmt("ERROR: disk layout changed - execute 'snac upgrade' first"); | 105 | else if (!check_strip_tool()) |
| 106 | else { | 106 | error = xs_fmt("ERROR: strip_exif enabled but commands not found or working"); |
| 107 | if (!check_strip_tool()) { | 107 | else |
| 108 | const char *mp = xs_dict_get(srv_config, "mogrify_path"); | 108 | ret = 1; |
| 109 | if (mp == NULL) mp = "mogrify"; | ||
| 110 | error = xs_fmt("ERROR: strip_exif enabled but '%s' not found or not working (set 'mogrify_path' in server.json)", mp); | ||
| 111 | } | ||
| 112 | else | ||
| 113 | ret = 1; | ||
| 114 | } | ||
| 115 | } | ||
| 116 | } | 109 | } |
| 117 | 110 | ||
| 118 | } | 111 | } |