summaryrefslogtreecommitdiffstats
path: root/src/bin/pg_rewind
diff options
context:
space:
mode:
Diffstat (limited to 'src/bin/pg_rewind')
-rw-r--r--src/bin/pg_rewind/filemap.c4
-rw-r--r--src/bin/pg_rewind/po/ru.po8
-rw-r--r--src/bin/pg_rewind/t/003_extrafiles.pl5
3 files changed, 13 insertions, 4 deletions
diff --git a/src/bin/pg_rewind/filemap.c b/src/bin/pg_rewind/filemap.c
index 6252931..24f508c 100644
--- a/src/bin/pg_rewind/filemap.c
+++ b/src/bin/pg_rewind/filemap.c
@@ -647,6 +647,10 @@ decide_file_action(file_entry_t *entry)
if (strcmp(path, "global/pg_control") == 0)
return FILE_ACTION_NONE;
+ /* Skip macOS system files */
+ if (strstr(path, ".DS_Store") != NULL)
+ return FILE_ACTION_NONE;
+
/*
* Remove all files matching the exclusion filters in the target.
*/
diff --git a/src/bin/pg_rewind/po/ru.po b/src/bin/pg_rewind/po/ru.po
index 4c95c7c..30e0b1d 100644
--- a/src/bin/pg_rewind/po/ru.po
+++ b/src/bin/pg_rewind/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pg_rewind (PostgreSQL current)\n"
"Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-02-02 18:11+0300\n"
+"POT-Creation-Date: 2024-05-04 10:36+0300\n"
"PO-Revision-Date: 2023-08-30 15:22+0300\n"
"Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
"Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
@@ -269,17 +269,17 @@ msgstr "повторный исходный файл \"%s\""
msgid "unexpected page modification for non-regular file \"%s\""
msgstr "неожиданная модификация страницы для файла особого вида \"%s\""
-#: filemap.c:679 filemap.c:773
+#: filemap.c:683 filemap.c:777
#, c-format
msgid "unknown file type for \"%s\""
msgstr "неизвестный тип файла \"%s\""
-#: filemap.c:706
+#: filemap.c:710
#, c-format
msgid "file \"%s\" is of different type in source and target"
msgstr "файл \"%s\" имеет разный тип в исходном и целевом кластере"
-#: filemap.c:778
+#: filemap.c:782
#, c-format
msgid "could not decide what to do with file \"%s\""
msgstr "не удалось определить, что делать с файлом \"%s\""
diff --git a/src/bin/pg_rewind/t/003_extrafiles.pl b/src/bin/pg_rewind/t/003_extrafiles.pl
index 100c212..54bb63c 100644
--- a/src/bin/pg_rewind/t/003_extrafiles.pl
+++ b/src/bin/pg_rewind/t/003_extrafiles.pl
@@ -5,6 +5,7 @@
use strict;
use warnings;
+use Config;
use PostgreSQL::Test::Utils;
use Test::More;
@@ -53,6 +54,10 @@ sub run_test
append_to_file
"$test_standby_datadir/tst_standby_dir/standby_subdir/standby_file4",
"in standby4";
+ # Skip testing .DS_Store files on macOS to avoid risk of side effects
+ append_to_file
+ "$test_standby_datadir/tst_standby_dir/.DS_Store",
+ "macOS system file" unless ($Config{osname} eq 'darwin');
mkdir "$test_primary_datadir/tst_primary_dir";
append_to_file "$test_primary_datadir/tst_primary_dir/primary_file1",