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

[interchange-core@interchange.redhat.com]

User:      jon
Date:      2002-02-06 18:23:14 GMT
Modified:  lib/Vend Config.pm
Log:
Tolerate more complex locale names like:

he_IL.ISO-8859-8
it_IT.UTF-8@euro

so character set and other oddities can be specified.

I've tested this in a catalog for several weeks and it looks like this
place is the only code segment that cares what a locale name can be.

Revision  Changes    Path
2.37      +3 -3      interchange/lib/Vend/Config.pm


rev 2.37, prev_rev 2.36
Index: Config.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Config.pm,v
retrieving revision 2.36
retrieving revision 2.37
diff -u -u -r2.36 -r2.37
--- Config.pm	6 Feb 2002 02:38:58 -0000	2.36
+++ Config.pm	6 Feb 2002 18:23:14 -0000	2.37
@@ -1,6 +1,6 @@
 # Vend::Config - Configure Interchange
 #
-# $Id: Config.pm,v 2.36 2002/02/06 02:38:58 mheins Exp $
+# $Id: Config.pm,v 2.37 2002/02/06 18:23:14 jon Exp $
 #
 # Copyright (C) 1996-2001 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -44,7 +44,7 @@
 use Vend::Parse;
 use Vend::Util;
 
-$VERSION = substr(q$Revision: 2.36 $, 10);
+$VERSION = substr(q$Revision: 2.37 $, 10);
 
 my %CDname;
 
@@ -1840,7 +1840,7 @@
 			unless defined $c->{frac_digits};
 		$store->{$name} = $c;
 	}
-	elsif ($settings =~ s/^\s*(\w+)\s+//) {
+	elsif ($settings =~ s/^\s*([\w.@-]+)\s+//) {
 		$name = $1;
 
 		undef $eval;