[interchange-cvs] interchange - jon modified scripts/interchange.PL

[interchange-core@interchange.redhat.com]

User:      jon
Date:      2002-06-26 21:45:20 GMT
Modified:  scripts  interchange.PL
Log:
Don't print error messages twice during startup, and don't print
'1' twice at end of usage output.

Revision  Changes    Path
2.36      +3 -2      interchange/scripts/interchange.PL


rev 2.36, prev_rev 2.35
Index: interchange.PL
===================================================================
RCS file: /var/cvs/interchange/scripts/interchange.PL,v
retrieving revision 2.35
retrieving revision 2.36
diff -u -u -r2.35 -r2.36
--- interchange.PL	25 Jun 2002 03:20:49 -0000	2.35
+++ interchange.PL	26 Jun 2002 21:45:20 -0000	2.36
@@ -50,7 +50,7 @@
 #
 # Interchange version 4.9.1
 #
-# $Id: interchange.PL,v 2.35 2002/06/25 03:20:49 mheins Exp $
+# $Id: interchange.PL,v 2.36 2002/06/26 21:45:20 jon Exp $
 #
 # Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -2838,7 +2838,7 @@
 	# Parse command line options, getting mode if not -serve
 	# May actually exit in some situations
 	parse_options()
-		or die usage() . "\n";
+		or usage(), die "\n";
 
 	# Cannot run as root unless in 'make test'
 	if($> == 0 and ! $Global::Windows) {
@@ -3008,6 +3008,7 @@
 eval { main_loop(); };
 if ($@) {
 	my($msg) = ($@);
+	$Vend::Log_suppress = 1;
 	logGlobal( $msg );
 	if ($Global::DisplayErrors) {
 		print "$msg\n";