pgsql: Make new strings more alike previously existing messages.

Started by Alvaro Herreraover 17 years ago3 messagescomitters
Jump to latest
#1Alvaro Herrera
alvherre@postgresql.org

Log Message:
-----------
Make new strings more alike previously existing messages.

Modified Files:
--------------
pgsql/src/bin/pg_dump:
pg_restore.c (r1.97 -> r1.98)
(http://anoncvs.postgresql.org/cvsweb.cgi/pgsql/src/bin/pg_dump/pg_restore.c?r1=1.97&r2=1.98)

#2Tom Lane
tgl@sss.pgh.pa.us
In reply to: Alvaro Herrera (#1)
Re: pgsql: Make new strings more alike previously existing messages.

alvherre@postgresql.org (Alvaro Herrera) writes:

Make new strings more alike previously existing messages.

This patch changed the meaning of one of the messages:

*************** main(int argc, char **argv)
*** 316,322 ****
  	/* Can't do single-txn mode with multiple connections */
  	if (opts->single_txn && opts->number_of_jobs > 1)
  	{
! 		fprintf(stderr, _("%s: cannot specify both --single-transaction and multiple jobs\n"),
  				progname);
  		exit(1);
  	}
--- 316,322 ----
  	/* Can't do single-txn mode with multiple connections */
  	if (opts->single_txn && opts->number_of_jobs > 1)
  	{
! 		fprintf(stderr, _("%s: options -1/--single-transaction and -j/--jobs cannot be used together\n"),
  				progname);
  		exit(1);
  	}

As the comment and the code itself show, "-j 1" works just fine with
--single-transaction. The original wording reflected that, the new does
not.

Maybe this amount of imprecision is acceptable, but "make it look more
like the other messages" doesn't seem to me like enough justification.

regards, tom lane

#3Alvaro Herrera
alvherre@2ndquadrant.com
In reply to: Tom Lane (#2)
Re: pgsql: Make new strings more alike previously existing messages.

Tom Lane wrote:

/* Can't do single-txn mode with multiple connections */
if (opts->single_txn && opts->number_of_jobs > 1)
{
! fprintf(stderr, _("%s: options -1/--single-transaction and -j/--jobs cannot be used together\n"),
progname);
exit(1);
}

As the comment and the code itself show, "-j 1" works just fine with
--single-transaction. The original wording reflected that, the new does
not.

Hmm, I didn't realize that you could usefully pass -j1 ... now I realize
that it even works in Make. You're right, the new message is bogus.
I'll revert this part.

--
Alvaro Herrera http://www.CommandPrompt.com/
PostgreSQL Replication, Consulting, Custom Development, 24x7 support