diff options
| author | Marius Bakke <marius@gnu.org> | 2022-02-13 14:24:53 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-02-13 14:24:53 +0100 |
| commit | 76b6bbdf232b4b82cdd23cfe0d81331a4fd2edec (patch) | |
| tree | 0e6a57ba08b9c6f9f5cbcdc5b5d9daeea91e428d /gnu/packages/patches/crawl-upgrade-saves.patch | |
| parent | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (diff) | |
| parent | e8af2ea63a7f497b8f8e19e206645109c0646e72 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/patches/crawl-upgrade-saves.patch')
| -rw-r--r-- | gnu/packages/patches/crawl-upgrade-saves.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gnu/packages/patches/crawl-upgrade-saves.patch b/gnu/packages/patches/crawl-upgrade-saves.patch index 4c0b3a427b..720a94f3e5 100644 --- a/gnu/packages/patches/crawl-upgrade-saves.patch +++ b/gnu/packages/patches/crawl-upgrade-saves.patch @@ -8,15 +8,15 @@ and crawl would never upgrade saves. diff -ur a/source/database.cc b/source/database.cc --- a/source/database.cc 2018-08-09 21:49:26.000000000 -0400 +++ b/source/database.cc 2018-10-07 18:06:41.022445789 -0400 -@@ -25,6 +25,7 @@ +@@ -24,6 +24,7 @@ + #include "stringutil.h" #include "syscalls.h" - #include "threads.h" #include "unicode.h" +#include "version.h" // TextDB handles dependency checking the db vs text files, creating the // db, loading, and destroying the DB. -@@ -55,6 +56,7 @@ +@@ -54,6 +55,7 @@ vector<string> _input_files; DBM* _db; string timestamp; @@ -62,16 +62,16 @@ diff -ur a/source/database.cc b/source/database.cc for (const string &file : _input_files) { string full_input_path = _directory + file; -@@ -245,7 +253,7 @@ +@@ -246,7 +254,7 @@ ts += buf; } -- if (no_files && timestamp.empty()) -+ if (no_files && timestamp.empty() && version.empty()) +- if (no_files) ++ if (no_files && version.empty()) { // No point in empty databases, although for simplicity keep ones // for disappeared translations for now. -@@ -313,7 +321,10 @@ +@@ -312,7 +320,10 @@ _store_text_db(full_input_path, _db); } } |