From 6524ceefae1b794abc80a2bf5d19c6134cf16b6d Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Fri, 14 Apr 2017 21:01:49 +0100 Subject: [PATCH] use File::Slurper instead of File::Slurp to better handle UTF8 in oui.txt --- Netdisco/Changes | 1 + Netdisco/Makefile.PL | 2 +- Netdisco/bin/netdisco-deploy | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Netdisco/Changes b/Netdisco/Changes index 88a27da9..180b5b7f 100644 --- a/Netdisco/Changes +++ b/Netdisco/Changes @@ -10,6 +10,7 @@ [BUG FIXES] * #296 Fix occasional empty macsuck when run in daemon + * use File::Slurper instead of File::Slurp to better handle UTF8 in oui.txt 2.034002 - 2017-01-06 diff --git a/Netdisco/Makefile.PL b/Netdisco/Makefile.PL index 90a63850..a5a2b0c0 100644 --- a/Netdisco/Makefile.PL +++ b/Netdisco/Makefile.PL @@ -27,7 +27,7 @@ requires 'Dancer::Plugin::Auth::Extensible' => 0.30; requires 'Dancer::Plugin::Passphrase' => '2.0.1'; requires 'Dancer::Session::Cookie' => '0.27'; requires 'File::ShareDir' => 1.03; -requires 'File::Slurp' => 9999.19; +requires 'File::Slurper' => 0.009; requires 'Guard' => 1.022; requires 'HTML::Parser' => 3.70; requires 'HTTP::Tiny' => 0.029; diff --git a/Netdisco/bin/netdisco-deploy b/Netdisco/bin/netdisco-deploy index 83067f46..ed0c86c1 100755 --- a/Netdisco/bin/netdisco-deploy +++ b/Netdisco/bin/netdisco-deploy @@ -50,7 +50,7 @@ use Term::ANSIColor; use Archive::Extract; $Archive::Extract::PREFER_BIN = 1; -use File::Slurp (); +use File::Slurper 'read_lines'; use HTTP::Tiny; use Digest::MD5; use Try::Tiny; @@ -195,7 +195,7 @@ sub deploy_oui { my %data = (); if (@ARGV) { - @lines = File::Slurp::read_file($ARGV[0], err_mode => 'quiet'); + @lines = File::Slurper::read_lines($ARGV[0]); } else { my $url = 'https://raw.githubusercontent.com/netdisco/upstream-sources/master/ieee/oui.txt';