[interchange-cvs] interchange - markj modified lib/Vend/Config.pm

[interchange-cvs at icdevgroup.org]

User:      markj
Date:      2008-02-26 13:55:47 GMT
Modified:  lib/Vend Config.pm
Log:
* Keep warnings and errors separated out. String eval handles $@ as the
  the followup code clearly intends, separating out errors+warnings, warnings
  only, and valid perl not resolving to a sub ref.

Revision  Changes    Path
2.234     +4 -7      interchange/lib/Vend/Config.pm


rev 2.234, prev_rev 2.233
Index: Config.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Config.pm,v
retrieving revision 2.233
retrieving revision 2.234
diff -u -r2.233 -r2.234
--- Config.pm	25 Feb 2008 10:02:30 -0000	2.233
+++ Config.pm	26 Feb 2008 13:55:47 -0000	2.234
@@ -1,6 +1,6 @@
 # Vend::Config - Configure Interchange
 #
-# $Id: Config.pm,v 2.233 2008/02/25 10:02:30 racke Exp $
+# $Id: Config.pm,v 2.234 2008/02/26 13:55:47 markj Exp $
 #
 # Copyright (C) 2002-2008 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -54,7 +54,7 @@
 use Vend::Data;
 use Vend::Cron;
 
-$VERSION = substr(q$Revision: 2.233 $, 10);
+$VERSION = substr(q$Revision: 2.234 $, 10);
 
 my %CDname;
 my %CPname;
@@ -5065,11 +5065,8 @@
 		my $fail = '';
 		{
 			local $SIG{'__WARN__'} = sub {$fail .= "$_[0]\n";};
-			eval {
-				package Vend::Interpolate;
-				$sub = eval $val;
-				warn $@ if $@;
-			};
+			package Vend::Interpolate;
+			$sub = eval $val;
 		}
 		if($@) {
 			config_warn(