[interchange-cvs] interchange - racke modified lib/Vend/Order.pm

[interchange-cvs at icdevgroup.org]

User:      racke
Date:      2005-11-01 11:14:49 GMT
Modified:  lib/Vend Order.pm
Log:
custom error messages for _ format routines were accidentally suppressed

Revision  Changes    Path
2.81      +4 -3      interchange/lib/Vend/Order.pm


rev 2.81, prev_rev 2.80
Index: Order.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/Order.pm,v
retrieving revision 2.80
retrieving revision 2.81
diff -u -r2.80 -r2.81
--- Order.pm	23 Oct 2005 14:23:45 -0000	2.80
+++ Order.pm	1 Nov 2005 11:14:49 -0000	2.81
@@ -1,6 +1,6 @@
 # Vend::Order - Interchange order routing routines
 #
-# $Id: Order.pm,v 2.80 2005/10/23 14:23:45 mheins Exp $
+# $Id: Order.pm,v 2.81 2005/11/01 11:14:49 racke Exp $
 #
 # Copyright (C) 2002-2003 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -29,7 +29,7 @@
 package Vend::Order;
 require Exporter;
 
-$VERSION = substr(q$Revision: 2.80 $, 10);
+$VERSION = substr(q$Revision: 2.81 $, 10);
 
 @ISA = qw(Exporter);
 
@@ -239,6 +239,7 @@
 	elsif ($OrderCheck and $sub = $OrderCheck->{$routine}) {
 #::logDebug("Using coderef OrderCheck = $sub");
 		@args = ($ref,$var,$val,$message);
+		undef $message;
 	}
 	elsif (defined &{"_$routine"}) {
 		$sub = \&{"_$routine"};
@@ -250,7 +251,7 @@
 
 	@return = $sub->(@args);
 
-	if(! $return[0] and ! $return[2] and $message) {
+	if(! $return[0] and $message) {
 		$return[2] = $message;
 	}
 	return @return;