From: Magnus Hagander <magnus@hagander.net>
Date: Sun, 16 Oct 2011 15:42:59 +0000 (+0200)
Subject: Exclude postmaster.opts from base backups
X-Git-Tag: REL9_1_2~69
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8c1501b292895bb883eaf6663934e9f7c45b043d;p=thirdparty%2Fpostgresql.git

Exclude postmaster.opts from base backups

Noted by Fujii Masao
---

diff --git a/src/backend/replication/basebackup.c b/src/backend/replication/basebackup.c
index bcde19c71b6..231a1de2f5e 100644
--- a/src/backend/replication/basebackup.c
+++ b/src/backend/replication/basebackup.c
@@ -577,8 +577,9 @@ sendDir(char *path, int basepathlen, bool sizeonly)
 
 		snprintf(pathbuf, MAXPGPATH, "%s/%s", path, de->d_name);
 
-		/* Skip postmaster.pid in the data directory */
-		if (strcmp(pathbuf, "./postmaster.pid") == 0)
+		/* Skip postmaster.pid and postmaster.opts in the data directory */
+		if (strcmp(pathbuf, "./postmaster.pid") == 0 ||
+			strcmp(pathbuf, "./postmaster.opts") == 0)
 			continue;
 
 		if (lstat(pathbuf, &statbuf) != 0)