[interchange-cvs] interchange - jon modified lib/Vend/Config.pm
interchange-core@interchange.redhat.com
interchange-core@interchange.redhat.com
Thu Jan 24 01:45:00 2002
User: jon
Date: 2002-01-24 06:44:28 GMT
Modified: lib/Vend Tag: STABLE_4_8-branch Config.pm
Log:
Merge error message improvement from trunk (2.23).
Revision Changes Path
No revision
No revision
2.2.2.7 +4 -4 interchange/lib/Vend/Config.pm
rev 2.2.2.7, prev_rev 2.2.2.6
Index: Config.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Config.pm,v
retrieving revision 2.2.2.6
retrieving revision 2.2.2.7
diff -u -u -r2.2.2.6 -r2.2.2.7
--- Config.pm 24 Jan 2002 05:07:01 -0000 2.2.2.6
+++ Config.pm 24 Jan 2002 06:44:28 -0000 2.2.2.7
@@ -1,6 +1,6 @@
# Vend::Config - Configure Interchange
#
-# $Id: Config.pm,v 2.2.2.6 2002/01/24 05:07:01 jon Exp $
+# $Id: Config.pm,v 2.2.2.7 2002/01/24 06:44:28 jon Exp $
#
# Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
#
@@ -95,7 +95,7 @@
use Vend::Parse;
use Vend::Util;
-$VERSION = substr(q$Revision: 2.2.2.6 $, 10);
+$VERSION = substr(q$Revision: 2.2.2.7 $, 10);
my %CDname;
@@ -680,7 +680,7 @@
}
}
- my(@include) = ($passed_file || $C->{ConfigFile});
+ my(@include) = my $catalogcfg = ($passed_file || $C->{ConfigFile});
my $done_one;
my ($db, $dname, $nm);
my ($before, $after);
@@ -1003,7 +1003,7 @@
my $msg = errmsg(
"Please specify the %s directive in the configuration file '%s'",
$CDname{$var},
- $configfile,
+ $catalogcfg,
);
die "$msg\n";