diff options
Diffstat (limited to 'contrib/pg_upgrade/exec.c')
| -rw-r--r-- | contrib/pg_upgrade/exec.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/contrib/pg_upgrade/exec.c b/contrib/pg_upgrade/exec.c index e326a10c613..44dafc36a91 100644 --- a/contrib/pg_upgrade/exec.c +++ b/contrib/pg_upgrade/exec.c @@ -140,13 +140,12 @@ exec_prog(const char *log_file, const char *opt_log_file, /* - * is_server_running() + * pid_lock_file_exists() * - * checks whether postmaster on the given data directory is running or not. - * The check is performed by looking for the existence of postmaster.pid file. + * Checks whether the postmaster.pid file exists. */ bool -is_server_running(const char *datadir) +pid_lock_file_exists(const char *datadir) { char path[MAXPGPATH]; int fd; @@ -180,8 +179,6 @@ void verify_directories(void) { - prep_status("Checking current, bin, and data directories"); - #ifndef WIN32 if (access(".", R_OK | W_OK | X_OK) != 0) #else @@ -194,7 +191,6 @@ verify_directories(void) check_data_dir(old_cluster.pgdata); check_bin_dir(&new_cluster); check_data_dir(new_cluster.pgdata); - check_ok(); } |