diff options
| author | Cédric Villemain | 2011-05-13 20:55:39 +0000 |
|---|---|---|
| committer | Cédric Villemain | 2011-05-13 20:55:39 +0000 |
| commit | e0c3b474d5436c7874aef36988f2646bdb890249 (patch) | |
| tree | 49c41d2b8abbd9bae4096643d840859f3a02a08c /contrib/pg_upgrade/option.c | |
| parent | 40cefa392974c73ec20deb3c15fb5111ed7fad17 (diff) | |
| parent | 9bb6d9795253bb521f81c626fea49a704a369ca9 (diff) | |
Merge branch 'master' into analyze_cacheanalyze_cache
Diffstat (limited to 'contrib/pg_upgrade/option.c')
| -rw-r--r-- | contrib/pg_upgrade/option.c | 47 |
1 files changed, 25 insertions, 22 deletions
diff --git a/contrib/pg_upgrade/option.c b/contrib/pg_upgrade/option.c index 857d6528c8..36561b9b4c 100644 --- a/contrib/pg_upgrade/option.c +++ b/contrib/pg_upgrade/option.c @@ -81,7 +81,7 @@ parseCommandLine(int argc, char *argv[]) } if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0) { - pg_log(PG_REPORT, "pg_upgrade " PG_VERSION "\n"); + puts("pg_upgrade (PostgreSQL) " PG_VERSION); exit(0); } } @@ -180,10 +180,10 @@ parseCommandLine(int argc, char *argv[]) */ /* truncate */ if ((log_opts.fd = fopen(log_opts.filename, "w")) == NULL) - pg_log(PG_FATAL, "Cannot write to log file %s\n", log_opts.filename); + pg_log(PG_FATAL, "cannot write to log file %s\n", log_opts.filename); fclose(log_opts.fd); if ((log_opts.fd = fopen(log_opts.filename, "a")) == NULL) - pg_log(PG_FATAL, "Cannot write to log file %s\n", log_opts.filename); + pg_log(PG_FATAL, "cannot write to log file %s\n", log_opts.filename); } else log_opts.filename = strdup(DEVNULL); @@ -193,7 +193,7 @@ parseCommandLine(int argc, char *argv[]) { log_opts.debug_fd = fopen(DEVTTY, "w"); if (!log_opts.debug_fd) - pg_log(PG_FATAL, "Cannot write to terminal\n"); + pg_log(PG_FATAL, "cannot write to terminal\n"); } /* Get values from env if not already set */ @@ -213,24 +213,26 @@ parseCommandLine(int argc, char *argv[]) static void usage(void) { - printf(_("\nUsage: pg_upgrade [OPTIONS]...\n\ + printf(_("pg_upgrade upgrades a PostgreSQL cluster to a different major version.\n\ +\nUsage:\n\ + pg_upgrade [OPTIONS]...\n\ \n\ Options:\n\ - -b, --old-bindir=old_bindir old cluster executable directory\n\ - -B, --new-bindir=new_bindir new cluster executable directory\n\ - -c, --check check clusters only, don't change any data\n\ - -d, --old-datadir=old_datadir old cluster data directory\n\ - -D, --new-datadir=new_datadir new cluster data directory\n\ - -g, --debug enable debugging\n\ - -G, --debugfile=debug_filename output debugging activity to file\n\ - -k, --link link instead of copying files to new cluster\n\ - -l, --logfile=log_filename log session activity to file\n\ - -p, --old-port=old_portnum old cluster port number (default %d)\n\ - -P, --new-port=new_portnum new cluster port number (default %d)\n\ - -u, --user=username clusters superuser (default \"%s\")\n\ - -v, --verbose enable verbose output\n\ - -V, --version display version information, then exit\n\ - -h, --help show this help, then exit\n\ + -b, --old-bindir=OLDBINDIR old cluster executable directory\n\ + -B, --new-bindir=NEWBINDIR new cluster executable directory\n\ + -c, --check check clusters only, don't change any data\n\ + -d, --old-datadir=OLDDATADIR old cluster data directory\n\ + -D, --new-datadir=NEWDATADIR new cluster data directory\n\ + -g, --debug enable debugging\n\ + -G, --debugfile=FILENAME output debugging activity to file\n\ + -k, --link link instead of copying files to new cluster\n\ + -l, --logfile=FILENAME log session activity to file\n\ + -p, --old-port=OLDPORT old cluster port number (default %d)\n\ + -P, --new-port=NEWPORT new cluster port number (default %d)\n\ + -u, --user=NAME clusters superuser (default \"%s\")\n\ + -v, --verbose enable verbose output\n\ + -V, --version display version information, then exit\n\ + -h, --help show this help, then exit\n\ \n\ Before running pg_upgrade you must:\n\ create a new database cluster (using the new version of initdb)\n\ @@ -240,8 +242,8 @@ Before running pg_upgrade you must:\n\ When you run pg_upgrade, you must provide the following information:\n\ the data directory for the old cluster (-d OLDDATADIR)\n\ the data directory for the new cluster (-D NEWDATADIR)\n\ - the 'bin' directory for the old version (-b OLDBINDIR)\n\ - the 'bin' directory for the new version (-B NEWBINDIR)\n\ + the \"bin\" directory for the old version (-b OLDBINDIR)\n\ + the \"bin\" directory for the new version (-B NEWBINDIR)\n\ \n\ For example:\n\ pg_upgrade -d oldCluster/data -D newCluster/data -b oldCluster/bin -B newCluster/bin\n\ @@ -261,6 +263,7 @@ or\n"), old_cluster.port, new_cluster.port, os_info.user); C:\\> set NEWBINDIR=newCluster/bin\n\ C:\\> pg_upgrade\n")); #endif + printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n")); } |