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

interchange-core@icdevgroup.org interchange-core@icdevgroup.org
Thu Aug 15 18:02:00 2002


User:      heins
Date:      2002-08-15 22:01:23 GMT
Modified:  lib/Vend Config.pm
Log:
* Don't warn about redefined scalar parameter if it was set by DatabaseDefa=
ult.

Revision  Changes    Path
2.67      +8 -4      interchange/lib/Vend/Config.pm


rev 2.67, prev_rev 2.66
Index: Config.pm
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvs/interchange/lib/Vend/Config.pm,v
retrieving revision 2.66
retrieving revision 2.67
diff -u -r2.66 -r2.67
--- Config.pm	12 Aug 2002 19:05:12 -0000	2.66
+++ Config.pm	15 Aug 2002 22:01:23 -0000	2.67
@@ -1,6 +1,6 @@
 # Vend::Config - Configure Interchange
 #
-# $Id: Config.pm,v 2.66 2002/08/12 19:05:12 mheins Exp $
+# $Id: Config.pm,v 2.67 2002/08/15 22:01:23 mheins Exp $
 #
 # Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -44,7 +44,7 @@
 use Vend::Parse;
 use Vend::Util;
=20
-$VERSION =3D substr(q$Revision: 2.66 $, 10);
+$VERSION =3D substr(q$Revision: 2.67 $, 10);
=20
 my %CDname;
=20
@@ -2678,8 +2678,10 @@
 		}
 		else {
 			defined $d->{$p}
+			and ! defined $C->{DatabaseDefault}{$p}
 				and config_warn(
-						"ConfigDatabase scalar parameter %s redefined to '%s', was %s.",
+						"ConfigDatabase %s scalar parameter %s redefined to '%s', was %s.",
+						$d->{name},
 						$p,
 						$val,
 						$d->{$p},
@@ -2854,9 +2856,11 @@
=20
 		else {
 			defined $d->{$p}
+			and ! defined $C->{DatabaseDefault}{$p}
 				and
 				config_warn(
-					"ConfigDatabase scalar parameter %s redefined to '%s', was %s.",
+					"Database %s scalar parameter %s redefined to '%s', was %s.",
+					$d->{name},
 					$p,
 					$val,
 					$d->{$p},