summaryrefslogtreecommitdiffstats
path: root/Bugzilla/Install
diff options
context:
space:
mode:
authorMax Kanat-Alexander <mkanat@bugzilla.org>2011-08-17 02:42:54 +0200
committerMax Kanat-Alexander <mkanat@bugzilla.org>2011-08-17 02:42:54 +0200
commita19a89b719051f356cf16060b35be9bc9aa6cb01 (patch)
tree06e0ea725fe804438333d8a9ca773995f6cb152c /Bugzilla/Install
parent80040dc6c543a114d4e21cd967ba5da7da04142e (diff)
downloadbugzilla-a19a89b719051f356cf16060b35be9bc9aa6cb01.tar.gz
bugzilla-a19a89b719051f356cf16060b35be9bc9aa6cb01.tar.xz
Bug 655472: Print out localconfig as UTF-8 so we don't mangle UTF-8 comments.
r=LpSolit, a=LpSolit
Diffstat (limited to 'Bugzilla/Install')
-rw-r--r--Bugzilla/Install/Localconfig.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/Bugzilla/Install/Localconfig.pm b/Bugzilla/Install/Localconfig.pm
index 3ce12207e..1ee7aca67 100644
--- a/Bugzilla/Install/Localconfig.pm
+++ b/Bugzilla/Install/Localconfig.pm
@@ -245,7 +245,8 @@ sub update_localconfig {
# Move any custom or old variables into a separate file.
if (scalar @old_vars) {
my $filename_old = "$filename.old";
- open(my $old_file, ">>$filename_old") || die "$filename_old: $!";
+ open(my $old_file, ">>:utf8", $filename_old)
+ or die "$filename_old: $!";
local $Data::Dumper::Purity = 1;
foreach my $var (@old_vars) {
print $old_file Data::Dumper->Dump([$localconfig->{$var}],
@@ -259,7 +260,7 @@ sub update_localconfig {
}
# Re-write localconfig
- open(my $fh, ">$filename") || die "$filename: $!";
+ open(my $fh, ">:utf8", $filename) or die "$filename: $!";
foreach my $var (LOCALCONFIG_VARS) {
my $name = $var->{name};
my $desc = install_string("localconfig_$name", { root => ROOT_USER });