From aa2a5e3b20707c81b1f26ed9b20fffbc83664989 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Tue, 27 Aug 2013 10:28:27 +0100
Subject: [PATCH] Handle UTF-8 data in device module hw_ver, sw_ver, fw_ver,
 model

---
 Netdisco/Changes                           | 1 +
 Netdisco/lib/App/Netdisco/Core/Discover.pm | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Netdisco/Changes b/Netdisco/Changes
index 0f54ed73..4f3e222f 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -3,6 +3,7 @@
   [BUG FIXES]
 
   * Check device is in storage before comparing last_* times with *_min_age
+  * Handle UTF-8 data in device module hw_ver, sw_ver, fw_ver, model
 
 2.014000 - 2013-08-26
 
diff --git a/Netdisco/lib/App/Netdisco/Core/Discover.pm b/Netdisco/lib/App/Netdisco/Core/Discover.pm
index cab35353..27244f25 100644
--- a/Netdisco/lib/App/Netdisco/Core/Discover.pm
+++ b/Netdisco/lib/App/Netdisco/Core/Discover.pm
@@ -543,10 +543,10 @@ sub store_modules {
           name   => $e_name->{$entry},
           class  => $e_class->{$entry},
           pos    => $e_pos->{$entry},
-          hw_ver => $e_hwver->{$entry},
-          fw_ver => $e_fwver->{$entry},
-          sw_ver => $e_swver->{$entry},
-          model  => $e_model->{$entry},
+          hw_ver => Encode::decode('UTF-8', $e_hwver->{$entry}),
+          fw_ver => Encode::decode('UTF-8', $e_fwver->{$entry}),
+          sw_ver => Encode::decode('UTF-8', $e_swver->{$entry}),
+          model  => Encode::decode('UTF-8', $e_model->{$entry}),
           serial => $e_serial->{$entry},
           fru    => $e_fru->{$entry},
           description => $e_descr->{$entry},