135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use File::Slurper instead of File::Slurp to better handle UTF8 in oui.txt

Browse Source
This commit is contained in:
Oliver Gorwits
2017-04-14 21:01:49 +01:00
parent 79b1520126
commit 6524ceefae
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Netdisco/Changes
View File

@@ -10,6 +10,7 @@
[BUG FIXES] [BUG FIXES]
* #296 Fix occasional empty macsuck when run in daemon * #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 2.034002 - 2017-01-06

2
Netdisco/Makefile.PL
View File

@@ -27,7 +27,7 @@ requires 'Dancer::Plugin::Auth::Extensible' => 0.30;
requires 'Dancer::Plugin::Passphrase' => '2.0.1'; requires 'Dancer::Plugin::Passphrase' => '2.0.1';
requires 'Dancer::Session::Cookie' => '0.27'; requires 'Dancer::Session::Cookie' => '0.27';
requires 'File::ShareDir' => 1.03; requires 'File::ShareDir' => 1.03;
requires 'File::Slurp' => 9999.19; requires 'File::Slurper' => 0.009;
requires 'Guard' => 1.022; requires 'Guard' => 1.022;
requires 'HTML::Parser' => 3.70; requires 'HTML::Parser' => 3.70;
requires 'HTTP::Tiny' => 0.029; requires 'HTTP::Tiny' => 0.029;

4
Netdisco/bin/netdisco-deploy
View File

@@ -50,7 +50,7 @@ use Term::ANSIColor;
use Archive::Extract; use Archive::Extract;
$Archive::Extract::PREFER_BIN = 1; $Archive::Extract::PREFER_BIN = 1;
use File::Slurp (); use File::Slurper 'read_lines';
use HTTP::Tiny; use HTTP::Tiny;
use Digest::MD5; use Digest::MD5;
use Try::Tiny; use Try::Tiny;
@@ -195,7 +195,7 @@ sub deploy_oui {
my %data = (); my %data = ();
if (@ARGV) { if (@ARGV) {
@lines = File::Slurp::read_file($ARGV[0], err_mode => 'quiet'); @lines = File::Slurper::read_lines($ARGV[0]);
} }
else { else {
my $url = 'https://raw.githubusercontent.com/netdisco/upstream-sources/master/ieee/oui.txt'; my $url = 'https://raw.githubusercontent.com/netdisco/upstream-sources/master/ieee/oui.txt';