diff options
| author | Bruce Momjian <bruce@momjian.us> | 2011-05-16 11:01:29 -0400 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2011-05-16 11:01:29 -0400 |
| commit | bda27e502fe9a3e9c54f065e4bc1315c3f2a57d7 (patch) | |
| tree | 933a9a7b168654a170e7240e961e15e6a583f3d4 | |
| parent | 6c19bd96bc5139fabace94c5a0a5624fd9d8e986 (diff) | |
| download | postgresql-bda27e502fe9a3e9c54f065e4bc1315c3f2a57d7.tar.gz postgresql-bda27e502fe9a3e9c54f065e4bc1315c3f2a57d7.zip | |
Add pg_upgrade check to make sure the user has full access permission in
the current directory; if not, throw an error.
| -rw-r--r-- | contrib/pg_upgrade/exec.c | 5 | ||||
| -rw-r--r-- | 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 71e84394e67..a66aeb03499 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 6eaaa0fb84c..e329dc3efe6 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) |