summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugeni Dodonov <eugeni@mandriva.org>2009-08-25 12:21:59 +0000
committerEugeni Dodonov <eugeni@mandriva.org>2009-08-25 12:21:59 +0000
commit4963fb90683eca3719312ee3b4d003d6cd821732 (patch)
treebd9878ae74e42328be3ca5cce61f0a90033df255
parent6697e1ba77314400f32350d8d75436eab3314556 (diff)
downloaddrakx-net-4963fb90683eca3719312ee3b4d003d6cd821732.tar
drakx-net-4963fb90683eca3719312ee3b4d003d6cd821732.tar.gz
drakx-net-4963fb90683eca3719312ee3b4d003d6cd821732.tar.bz2
drakx-net-4963fb90683eca3719312ee3b4d003d6cd821732.tar.xz
drakx-net-4963fb90683eca3719312ee3b4d003d6cd821732.zip
support utf8-encoded network profiles
-rw-r--r--NEWS1
-rw-r--r--lib/network/network.pm3
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index ba5509d..b1fce04 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+- assume that network profiles could be utf8-encoded (#53127).
- update drakfirewall entry related to network services autodiscovery
- make drakfirewall module return something
diff --git a/lib/network/network.pm b/lib/network/network.pm
index 6dc90ed..1655ba9 100644
--- a/lib/network/network.pm
+++ b/lib/network/network.pm
@@ -13,6 +13,7 @@ use run_program;
use network::tools;
use vars qw(@ISA @EXPORT);
use log;
+use Encode qw(encode decode);
our $network_file = "/etc/sysconfig/network";
my $resolv_file = "/etc/resolv.conf";
@@ -439,7 +440,7 @@ sub netprofile_delete {
}
sub netprofile_list() {
- map { if_(m!([^/]*)/$!, $1) } glob("$::prefix/etc/netprofile/profiles/*/");
+ map { if_(m!([^/]*)/$!, decode("utf8", $1)) } glob("$::prefix/etc/netprofile/profiles/*/");
}
sub netprofile_count() {