From bda27e502fe9a3e9c54f065e4bc1315c3f2a57d7 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Mon, 16 May 2011 11:01:29 -0400 Subject: [PATCH] Add pg_upgrade check to make sure the user has full access permission in the current directory; if not, throw an error. --- contrib/pg_upgrade/exec.c | 5 +++++ contrib/pg_upgrade/pg_upgrade.c | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/contrib/pg_upgrade/exec.c b/contrib/pg_upgrade/exec.c index 71e84394e6..a66aeb0349 100644 --- a/contrib/pg_upgrade/exec.c +++ b/contrib/pg_upgrade/exec.c @@ -93,6 +93,11 @@ is_server_running(const char *datadir) void verify_directories(void) { + + if (access(".", R_OK | W_OK | X_OK) != 0) + pg_log(PG_FATAL, + "You must have full access permissions in the current directory.\n"); + prep_status("Checking old data directory (%s)", old_cluster.pgdata); check_data_dir(old_cluster.pgdata); check_ok(); diff --git a/contrib/pg_upgrade/pg_upgrade.c b/contrib/pg_upgrade/pg_upgrade.c index 6eaaa0fb84..e329dc3efe 100644 --- a/contrib/pg_upgrade/pg_upgrade.c +++ b/contrib/pg_upgrade/pg_upgrade.c @@ -155,17 +155,13 @@ setup(char *argv0, bool live_check) /* no postmasters should be running */ if (!live_check && is_server_running(old_cluster.pgdata)) - { pg_log(PG_FATAL, "There seems to be a postmaster servicing the old cluster.\n" "Please shutdown that postmaster and try again.\n"); - } /* same goes for the new postmaster */ if (is_server_running(new_cluster.pgdata)) - { pg_log(PG_FATAL, "There seems to be a postmaster servicing the new cluster.\n" "Please shutdown that postmaster and try again.\n"); - } /* get path to pg_upgrade executable */ if (find_my_exec(argv0, exec_path) < 0) -- 2.40.0