diff options
| author | Bruce Momjian | 2010-10-19 02:55:58 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2010-10-19 02:55:58 +0000 |
| commit | fc8470ed4d7aca48b14521168d607ef8bbdcf0e1 (patch) | |
| tree | 9c4796fb4fdab4998fa4da7148c524af9c24f3e6 | |
| parent | 377e6e97eb59f14ca91ef38785c3dbc36e3111cd (diff) | |
In pg_upgrade, rename macro EXEC_EXT to SHELL_EXT for clarity.REL9_0_STABLE
Backpatch to 9.0.X.
| -rw-r--r-- | contrib/pg_upgrade/check.c | 2 | ||||
| -rw-r--r-- | contrib/pg_upgrade/pg_upgrade.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c index 654a1a3866..fb35507af1 100644 --- a/contrib/pg_upgrade/check.c +++ b/contrib/pg_upgrade/check.c @@ -389,7 +389,7 @@ create_script_for_old_cluster_deletion(migratorContext *ctx, prep_status(ctx, "Creating script to delete old cluster"); snprintf(*deletion_script_file_name, MAXPGPATH, "%s/delete_old_cluster.%s", - ctx->cwd, EXEC_EXT); + ctx->cwd, SHELL_EXT); if ((script = fopen(*deletion_script_file_name, "w")) == NULL) pg_log(ctx, PG_FATAL, "Could not create necessary file: %s\n", diff --git a/contrib/pg_upgrade/pg_upgrade.h b/contrib/pg_upgrade/pg_upgrade.h index 79a49bc052..144161b637 100644 --- a/contrib/pg_upgrade/pg_upgrade.h +++ b/contrib/pg_upgrade/pg_upgrade.h @@ -39,14 +39,14 @@ #define pg_mv_file rename #define pg_link_file link #define RMDIR_CMD "rm -rf" -#define EXEC_EXT "sh" +#define SHELL_EXT "sh" #else #define pg_copy_file CopyFile #define pg_mv_file pgrename #define pg_link_file win32_pghardlink #define sleep(x) Sleep(x * 1000) #define RMDIR_CMD "RMDIR /s/q" -#define EXEC_EXT "bat" +#define SHELL_EXT "bat" #define EXE_EXT ".exe" #endif |