Skip to content

Commit 953f68a

Browse files
vbwagnervbwagner
committed
Fixed bug reporting address in --help messages
1 parent c0c3c35 commit 953f68a

File tree

38 files changed

+43
-41
lines changed

38 files changed

+43
-41
lines changed

‎contrib/oid2name/oid2name.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ help(const char *progname)
188188
" -x extended (show additional columns)\n"
189189
" -?, --help show this help, then exit\n"
190190
"\nThe default action is to show all database OIDs.\n\n"
191-
"Report bugs to <pgsql-bugs@postgresql.org>.\n",
191+
"Report bugs to <" PACKAGE_BUGREPORT ">.\n",
192192
progname, progname);
193193
}
194194

‎contrib/pg_standby/pg_standby.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ usage(void)
524524
" restore_command = 'pg_standby [OPTION]... ARCHIVELOCATION %%f %%p %%r'\n"
525525
"e.g.\n"
526526
" restore_command = 'pg_standby /mnt/server/archiverdir %%f %%p %%r'\n");
527-
printf("\nReport bugs to <pgsql-bugs@postgresql.org>.\n");
527+
printf("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n");
528528
}
529529

530530
#ifndef WIN32

‎contrib/vacuumlo/vacuumlo.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ usage(const char *progname)
443443
printf(" -w never prompt for password\n");
444444
printf(" -W force password prompt\n");
445445
printf("\n");
446-
printf("Report bugs to <pgsql-bugs@postgresql.org>.\n");
446+
printf("Report bugs to <" PACKAGE_BUGREPORT ">.\n");
447447
}
448448

449449

‎src/backend/main/main.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,8 @@ help(const char *progname)
377377
printf(_("\nPlease read the documentation for the complete list of run-time\n"
378378
"configuration settings and how to set them on the command line or in\n"
379379
"the configuration file.\n\n"
380-
"Report bugs to <pgsql-bugs@postgresql.org>.\n"));
380+
"Report bugs to <" PACKAGE_BUGREPORT ">.\n"));
381+
381382
}
382383

383384

‎src/backend/postmaster/postmaster.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4871,7 +4871,7 @@ ExitPostmaster(int status)
48714871
ereport(LOG,
48724872
(errcode(ERRCODE_INTERNAL_ERROR),
48734873
errmsg_internal("postmaster became multithreaded"),
4874-
errdetail("Please report this to <pgsql-bugs@postgresql.org>.")));
4874+
errdetail("Please report this to <" PACKAGE_BUGREPORT ">.")));
48754875
#endif
48764876

48774877
/* should cleanup shared memory and kill all backends */

‎src/bin/initdb/initdb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2679,7 +2679,7 @@ usage(const char *progname)
26792679
printf(_(" -?, --help show this help, then exit\n"));
26802680
printf(_("\nIf the data directory is not specified, the environment variable PGDATA\n"
26812681
"is used.\n"));
2682-
printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
2682+
printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));
26832683
}
26842684

26852685
static void

‎src/bin/pg_archivecleanup/pg_archivecleanup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ usage(void)
278278
"Or for use as a standalone archive cleaner:\n"
279279
"e.g.\n"
280280
" pg_archivecleanup /mnt/server/archiverdir 000000010000000000000010.00000020.backup\n");
281-
printf("\nReport bugs to <pgsql-bugs@postgresql.org>.\n");
281+
printf("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n");
282282
}
283283

284284
/*------------ MAIN ----------------------------------------*/

‎src/bin/pg_basebackup/pg_basebackup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ usage(void)
267267
printf(_(" -U, --username=NAME connect as specified database user\n"));
268268
printf(_(" -w, --no-password never prompt for password\n"));
269269
printf(_(" -W, --password force password prompt (should happen automatically)\n"));
270-
printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
270+
printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));
271271
}
272272

273273

‎src/bin/pg_basebackup/pg_receivexlog.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ usage(void)
8686
printf(_("\nOptional actions:\n"));
8787
printf(_(" --create-slot create a new replication slot (for the slot's name see --slot)\n"));
8888
printf(_(" --drop-slot drop the replication slot (for the slot's name see --slot)\n"));
89-
printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
89+
printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));
9090
}
9191

9292
static bool

‎src/bin/pg_basebackup/pg_recvlogical.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ usage(void)
9999
printf(_(" -U, --username=NAME connect as specified database user\n"));
100100
printf(_(" -w, --no-password never prompt for password\n"));
101101
printf(_(" -W, --password force password prompt (should happen automatically)\n"));
102-
printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
102+
printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));
103103
}
104104

105105
/*

‎src/bin/pg_config/pg_config.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ help(void)
102102
printf(_(" --version show the PostgreSQL version\n"));
103103
printf(_(" -?, --help show this help, then exit\n"));
104104
printf(_("\nWith no arguments, all known items are shown.\n\n"));
105-
printf(_("Report bugs to <pgsql-bugs@postgresql.org>.\n"));
105+
printf(_("Report bugs to <" PACKAGE_BUGREPORT ">.\n"));
106106
}
107107

108108
static void

‎src/bin/pg_controldata/pg_controldata.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ usage(const char *progname)
3939
printf(_(" -?, --help show this help, then exit\n"));
4040
printf(_("\nIf no data directory (DATADIR) is specified, "
4141
"the environment variable PGDATA\nis used.\n\n"));
42-
printf(_("Report bugs to <pgsql-bugs@postgresql.org>.\n"));
42+
printf(_("Report bugs to <" PACKAGE_BUGREPORT ">.\n"));
4343
}
4444

4545

‎src/bin/pg_ctl/pg_ctl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1970,7 +1970,7 @@ do_help(void)
19701970
printf(_(" demand start service on demand\n"));
19711971
#endif
19721972

1973-
printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
1973+
printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));
19741974
}
19751975

19761976

‎src/bin/pg_dump/pg_dump.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -940,7 +940,7 @@ help(const char *progname)
940940

941941
printf(_("\nIf no database name is supplied, then the PGDATABASE environment\n"
942942
"variable value is used.\n\n"));
943-
printf(_("Report bugs to <pgsql-bugs@postgresql.org>.\n"));
943+
printf(_("Report bugs to <" PACKAGE_BUGREPORT ">.\n"));
944944
}
945945

946946
static void

‎src/bin/pg_dump/pg_dumpall.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ help(void)
589589

590590
printf(_("\nIf -f/--file is not used, then the SQL script will be written to the standard\n"
591591
"output.\n\n"));
592-
printf(_("Report bugs to <pgsql-bugs@postgresql.org>.\n"));
592+
printf(_("Report bugs to <" PACKAGE_BUGREPORT ">.\n"));
593593
}
594594

595595

‎src/bin/pg_dump/pg_restore.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,5 +490,5 @@ usage(const char *progname)
490490
"The options -I, -n, -P, -t, -T, and --section can be combined and specified\n"
491491
"multiple times to select multiple objects.\n"));
492492
printf(_("\nIf no input file name is supplied, then standard input is used.\n\n"));
493-
printf(_("Report bugs to <pgsql-bugs@postgresql.org>.\n"));
493+
printf(_("Report bugs to <" PACKAGE_BUGREPORT ">.\n"));
494494
}

‎src/bin/pg_resetxlog/pg_resetxlog.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1180,5 +1180,5 @@ usage(void)
11801180
printf(_(" -V, --version output version information, then exit\n"));
11811181
printf(_(" -x XID set next transaction ID\n"));
11821182
printf(_(" -?, --help show this help, then exit\n"));
1183-
printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
1183+
printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));
11841184
}

‎src/bin/pg_rewind/pg_rewind.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ usage(const char *progname)
7272
printf(_(" --debug write a lot of debug messages\n"));
7373
printf(_(" -V, --version output version information, then exit\n"));
7474
printf(_(" -?, --help show this help, then exit\n"));
75-
printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
75+
printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));
7676
}
7777

7878

‎src/bin/pg_upgrade/option.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ or\n"), old_cluster.port, new_cluster.port, os_info.user);
326326
C:\\> set PGBINNEW=newCluster/bin\n\
327327
C:\\> pg_upgrade\n"));
328328
#endif
329-
printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
329+
printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));
330330
}
331331

332332

‎src/bin/pgbench/pgbench.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ usage(void)
449449
" -V, --version output version information, then exit\n"
450450
" -?, --help show this help, then exit\n"
451451
"\n"
452-
"Report bugs to <pgsql-bugs@postgresql.org>.\n",
452+
"Report bugs to <" PACKAGE_BUGREPORT ">.\n",
453453
progname, progname);
454454
}
455455

‎src/bin/psql/help.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ usage(unsigned short int pager)
144144
fprintf(output, _("\nFor more information, type \"\\?\" (for internal commands) or \"\\help\" (for SQL\n"
145145
"commands) from within psql, or consult the psql section in the PostgreSQL\n"
146146
"documentation.\n\n"));
147-
fprintf(output, _("Report bugs to <pgsql-bugs@postgresql.org>.\n"));
147+
fprintf(output, _("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
148148

149149
ClosePager(output);
150150
}

‎src/bin/scripts/clusterdb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,5 +286,5 @@ help(const char *progname)
286286
printf(_(" -W, --password force password prompt\n"));
287287
printf(_(" --maintenance-db=DBNAME alternate maintenance database\n"));
288288
printf(_("\nRead the description of the SQL command CLUSTER for details.\n"));
289-
printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
289+
printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));
290290
}

‎src/bin/scripts/createdb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,5 +270,5 @@ help(const char *progname)
270270
printf(_(" -W, --password force password prompt\n"));
271271
printf(_(" --maintenance-db=DBNAME alternate maintenance database\n"));
272272
printf(_("\nBy default, a database with the same name as the current user is created.\n"));
273-
printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
273+
printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));
274274
}

‎src/bin/scripts/createlang.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,5 +247,5 @@ help(const char *progname)
247247
printf(_(" -U, --username=USERNAME user name to connect as\n"));
248248
printf(_(" -w, --no-password never prompt for password\n"));
249249
printf(_(" -W, --password force password prompt\n"));
250-
printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
250+
printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));
251251
}

‎src/bin/scripts/createuser.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,5 +378,5 @@ help(const char *progname)
378378
printf(_(" -U, --username=USERNAME user name to connect as (not the one to create)\n"));
379379
printf(_(" -w, --no-password never prompt for password\n"));
380380
printf(_(" -W, --password force password prompt\n"));
381-
printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
381+
printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));
382382
}

‎src/bin/scripts/dropdb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,5 +167,5 @@ help(const char *progname)
167167
printf(_(" -w, --no-password never prompt for password\n"));
168168
printf(_(" -W, --password force password prompt\n"));
169169
printf(_(" --maintenance-db=DBNAME alternate maintenance database\n"));
170-
printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
170+
printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));
171171
}

‎src/bin/scripts/droplang.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,5 +248,5 @@ help(const char *progname)
248248
printf(_(" -U, --username=USERNAME user name to connect as\n"));
249249
printf(_(" -w, --no-password never prompt for password\n"));
250250
printf(_(" -W, --password force password prompt\n"));
251-
printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
251+
printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));
252252
}

‎src/bin/scripts/dropuser.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,5 +168,5 @@ help(const char *progname)
168168
printf(_(" -U, --username=USERNAME user name to connect as (not the one to drop)\n"));
169169
printf(_(" -w, --no-password never prompt for password\n"));
170170
printf(_(" -W, --password force password prompt\n"));
171-
printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
171+
printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));
172172
}

‎src/bin/scripts/pg_isready.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,5 +233,5 @@ help(const char *progname)
233233
printf(_(" -p, --port=PORT database server port\n"));
234234
printf(_(" -t, --timeout=SECS seconds to wait when attempting connection, 0 disables (default: %s)\n"), DEFAULT_CONNECT_TIMEOUT);
235235
printf(_(" -U, --username=USERNAME user name to connect as\n"));
236-
printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
236+
printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));
237237
}

‎src/bin/scripts/reindexdb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,5 +420,5 @@ help(const char *progname)
420420
printf(_(" -W, --password force password prompt\n"));
421421
printf(_(" --maintenance-db=DBNAME alternate maintenance database\n"));
422422
printf(_("\nRead the description of the SQL command REINDEX for details.\n"));
423-
printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
423+
printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));
424424
}

‎src/bin/scripts/vacuumdb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -969,5 +969,5 @@ help(const char *progname)
969969
printf(_(" -W, --password force password prompt\n"));
970970
printf(_(" --maintenance-db=DBNAME alternate maintenance database\n"));
971971
printf(_("\nRead the description of the SQL command VACUUM for details.\n"));
972-
printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
972+
printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));
973973
}

‎src/include/storage/s_lock.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -896,7 +896,7 @@ spin_delay(void)
896896

897897
/* Blow up if we didn't have any way to do spinlocks */
898898
#ifndef HAS_TEST_AND_SET
899-
#error PostgreSQL does not have native spinlock support on this platform. To continue the compilation, rerun configure using --disable-spinlocks. However, performance will be poor. Please report this to pgsql-bugs@postgresql.org.
899+
#error PostgreSQL does not have native spinlock support on this platform. To continue the compilation, rerun configure using --disable-spinlocks. However, performance will be poor. Please report this to bugs@postgrespro.org.
900900
#endif
901901

902902

‎src/interfaces/ecpg/preproc/ecpg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ help(const char *progname)
5858
printf(_(" -?, --help show this help, then exit\n"));
5959
printf(_("\nIf no output file is specified, the name is formed by adding .c to the\n"
6060
"input file name, after stripping off .pgc if present.\n"));
61-
printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
61+
printf(_("\nReport bugs to <" PACKAGE_BUGREPORT ">.\n"));
6262
}
6363

6464
static void

‎src/interfaces/ecpg/preproc/pgc.l

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1256,7 +1256,7 @@ cppline {space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
12561256

12571257
}
12581258
}
1259-
<INITIAL>{other}|\n { mmfatal(PARSE_ERROR, "internal error: unreachable state; please report this to <pgsql-bugs@postgresql.org>"); }
1259+
<INITIAL>{other}|\n { mmfatal(PARSE_ERROR, "internal error: unreachable state; please report this to <" PACKAGE_BUGREPORT ">"); }
12601260
%%
12611261
void
12621262
lex_init(void)

‎src/interfaces/ecpg/preproc/po/ru.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,10 +171,10 @@ msgstr ""
171171
#, c-format
172172
msgid ""
173173
"\n"
174-
"Report bugs to <pgsql-bugs@postgresql.org>.\n"
174+
"Report bugs to <bugs@postgrespro.ru>.\n"
175175
msgstr ""
176176
"\n"
177-
"Об ошибках сообщайте по адресу <pgsql-bugs@postgresql.org>.\n"
177+
"Об ошибках сообщайте по адресу <bugs@postgrespro.ru>.\n"
178178

179179
#: ecpg.c:139
180180
#, c-format

‎src/interfaces/ecpg/preproc/type.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ ECPGdump_a_type(FILE *o, const char *name, struct ECPGtype * type, const int bra
299299
break;
300300
default:
301301
if (!IS_SIMPLE_TYPE(type->u.element->type))
302-
base_yyerror("internal error: unknown datatype, please report this to <pgsql-bugs@postgresql.org>");
302+
base_yyerror("internal error: unknown datatype, please report this to <" PACKAGE_BUGREPORT ">");
303303

304304
ECPGdump_a_simple(o, name,
305305
type->u.element->type,
@@ -651,7 +651,7 @@ ECPGfree_type(struct ECPGtype * type)
651651
break;
652652
default:
653653
if (!IS_SIMPLE_TYPE(type->u.element->type))
654-
base_yyerror("internal error: unknown datatype, please report this to <pgsql-bugs@postgresql.org>");
654+
base_yyerror("internal error: unknown datatype, please report this to <" PACKAGE_BUGREPORT ">");
655655

656656
free(type->u.element);
657657
}

‎src/port/chklocale.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ pg_codepage_to_encoding(UINT cp)
291291

292292
ereport(WARNING,
293293
(errmsg("could not determine encoding for codeset \"%s\"", sys),
294-
errdetail("Please report this to <pgsql-bugs@postgresql.org>.")));
294+
errdetail("Please report this to <" PACKAGE_BUGREPORT ">.")));
295295

296296
return -1;
297297
}
@@ -420,7 +420,8 @@ pg_get_encoding_from_locale(const char *ctype, bool write_message)
420420
ereport(WARNING,
421421
(errmsg("could not determine encoding for locale \"%s\": codeset is \"%s\"",
422422
ctype, sys),
423-
errdetail("Please report this to <pgsql-bugs@postgresql.org>.")));
423+
errdetail("Please report this to <" PACKAGE_BUGREPORT ">.")));
424+
424425
#endif
425426
}
426427

‎src/test/regress/pg_regress.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1988,7 +1988,7 @@ help(void)
19881988
printf(_("The exit status is 0 if all tests passed, 1 if some tests failed, and 2\n"));
19891989
printf(_("if the tests could not be run for some reason.\n"));
19901990
printf(_("\n"));
1991-
printf(_("Report bugs to <pgsql-bugs@postgresql.org>.\n"));
1991+
printf(_("Report bugs to <" PACKAGE_BUGREPORT ">.\n"));
19921992
}
19931993

19941994
int

0 commit comments

Comments
 (0)