Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit b133ceb

Browse files
committed
Revert patch so .psqlrc can suppress startup banner:
In psql, run .psqlrc _after_ printing warnings and banner.
1 parent 4b362c6 commit b133ceb

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

src/bin/psql/startup.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright (c) 2000-2008, PostgreSQL Global Development Group
55
*
6-
* $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.150 2008/07/18 17:19:55 momjian Exp $
6+
* $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.151 2008/07/20 06:08:38 momjian Exp $
77
*/
88
#include "postgres_fe.h"
99

@@ -281,14 +281,12 @@ main(int argc, char *argv[])
281281
*/
282282
else
283283
{
284-
connection_warnings();
285-
if (!pset.quiet && !pset.notty)
286-
printf(_("Type \"help\" for help.\n"));
287284
if (!options.no_psqlrc)
288285
process_psqlrc(argv[0]);
289-
/* output newline here because .psqlrc might output something */
286+
287+
connection_warnings();
290288
if (!pset.quiet && !pset.notty)
291-
printf("\n");
289+
printf(_("Type \"help\" for help.\n\n"));
292290
if (!pset.notty)
293291
initializeInput(options.no_readline ? 0 : 1);
294292
if (options.action_string) /* -f - was used */

0 commit comments

Comments
 (0)