[interchange-cvs] interchange - racke modified 2 files

[interchange-cvs at icdevgroup.org]

User:      racke
Date:      2006-11-21 22:32:13 GMT
Modified:  lib/Vend Config.pm Util.pm
Log:
preserve currency locale settings in a different repository set up at config time, fixes Debian bug #397750

Revision  Changes    Path
2.210     +12 -2     interchange/lib/Vend/Config.pm


rev 2.210, prev_rev 2.209
Index: Config.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Config.pm,v
retrieving revision 2.209
retrieving revision 2.210
diff -u -r2.209 -r2.210
--- Config.pm	19 Nov 2006 20:59:56 -0000	2.209
+++ Config.pm	21 Nov 2006 22:32:12 -0000	2.210
@@ -1,6 +1,6 @@
 # Vend::Config - Configure Interchange
 #
-# $Id: Config.pm,v 2.209 2006/11/19 20:59:56 racke Exp $
+# $Id: Config.pm,v 2.210 2006/11/21 22:32:12 racke Exp $
 #
 # Copyright (C) 2002-2006 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.209 $, 10);
+$VERSION = substr(q$Revision: 2.210 $, 10);
 
 my %CDname;
 my %CPname;
@@ -3438,6 +3438,16 @@
 							}
 						}
 
+						# create currency repositories
+						for my $locale (keys %{$C->{Locale_repository}}) {
+							for my $key (@Locale_keys_currency) {
+								if ($C->{Locale_repository}->{$locale}->{$key}) {
+									$C->{Currency_repository}->{$locale}->{$key}
+										= $C->{Locale_repository}->{$locale}->{$key};
+								}
+							}
+						}
+						
 						push @Dispatches, 'Locale';
 						return 1;
 					},



2.101     +3 -3      interchange/lib/Vend/Util.pm


rev 2.101, prev_rev 2.100
Index: Util.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Util.pm,v
retrieving revision 2.100
retrieving revision 2.101
diff -u -r2.100 -r2.101
--- Util.pm	15 Nov 2006 15:49:17 -0000	2.100
+++ Util.pm	21 Nov 2006 22:32:12 -0000	2.101
@@ -1,6 +1,6 @@
 # Vend::Util - Interchange utility functions
 #
-# $Id: Util.pm,v 2.100 2006/11/15 15:49:17 kwalsh Exp $
+# $Id: Util.pm,v 2.101 2006/11/21 22:32:12 racke Exp $
 # 
 # Copyright (C) 2002-2005 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -88,7 +88,7 @@
 use Vend::File;
 use subs qw(logError logGlobal);
 use vars qw($VERSION @EXPORT @EXPORT_OK);
-$VERSION = substr(q$Revision: 2.100 $, 10);
+$VERSION = substr(q$Revision: 2.101 $, 10);
 
 my $Eval_routine;
 my $Eval_routine_file;
@@ -417,7 +417,7 @@
     }
 
     if ($currency) {
-        my $curr = $Vend::Cfg->{Locale_repository}{$currency};
+        my $curr = $Vend::Cfg->{Currency_repository}{$currency};
 
         for(@Vend::Config::Locale_directives_currency) {
             $Vend::Cfg->{$_} = $curr->{$_}