Skip to content

Commit 9df96f9

Browse files
committed
In pg_upgrade, rename macro EXEC_EXT to SHELL_EXT for clarity.
Backpatch to 9.0.X.
1 parent bc8624b commit 9df96f9

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

contrib/pg_upgrade/check.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ create_script_for_old_cluster_deletion(migratorContext *ctx,
389389
prep_status(ctx, "Creating script to delete old cluster");
390390

391391
snprintf(*deletion_script_file_name, MAXPGPATH, "%s/delete_old_cluster.%s",
392-
ctx->cwd, EXEC_EXT);
392+
ctx->cwd, SHELL_EXT);
393393

394394
if ((script = fopen(*deletion_script_file_name, "w")) == NULL)
395395
pg_log(ctx, PG_FATAL, "Could not create necessary file: %s\n",

contrib/pg_upgrade/pg_upgrade.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@
3939
#define pg_mv_file rename
4040
#define pg_link_file link
4141
#define RMDIR_CMD "rm -rf"
42-
#define EXEC_EXT "sh"
42+
#define SHELL_EXT "sh"
4343
#else
4444
#define pg_copy_file CopyFile
4545
#define pg_mv_file pgrename
4646
#define pg_link_file win32_pghardlink
4747
#define sleep(x) Sleep(x * 1000)
4848
#define RMDIR_CMD "RMDIR /s/q"
49-
#define EXEC_EXT "bat"
49+
#define SHELL_EXT "bat"
5050
#define EXE_EXT ".exe"
5151
#endif
5252

0 commit comments

Comments
 (0)