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

#762 wide character error on deploy with local oui.txt

Browse Source
This commit is contained in:
Oliver Gorwits
2021-02-10 13:48:53 +00:00
parent b7ac3a3bd5
commit 942e118e4d
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Changes
View File

@@ -3,6 +3,7 @@
[BUG FIXES] [BUG FIXES]
* #740 more robust log rotation * #740 more robust log rotation
* #762 wide character error on deploy with local oui.txt
2.047002 - 2020-12-30 2.047002 - 2020-12-30

4
bin/netdisco-deploy
View File

@@ -225,7 +225,7 @@ sub deploy_oui {
my %data = (); my %data = ();
if (@ARGV) { if (@ARGV) {
@lines = File::Slurper::read_lines($ARGV[0]); @lines = File::Slurper::read_lines($ARGV[0], 'iso-8859-1');
} }
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';
@@ -275,7 +275,7 @@ sub deploy_oui {
sub shorten { sub shorten {
my $manuf = shift; my $manuf = shift;
$manuf = decode("utf8", $manuf, Encode::FB_CROAK) unless @ARGV; $manuf = decode("utf8", $manuf, Encode::FB_CROAK);
$manuf = " " . $manuf . " "; $manuf = " " . $manuf . " ";
# Remove any punctuation # Remove any punctuation