From a59fbce9c9541802d04ff952d1a9371c5cdec91e Mon Sep 17 00:00:00 2001 From: Matt Derksen Date: Thu, 13 Oct 2016 09:12:33 -0500 Subject: Updated genMemVpd.pl to strip carriage returns from line data Matching is thrown off with the invisible returns, so just removing them. Change-Id: I3dbe419876b53d9ff8a6efa761f695786b86a2b2 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/31139 Reviewed-by: Daniel M. Crowell Reviewed-by: Martin Gloff Tested-by: Jenkins Server Reviewed-by: BRADLEY REID Reviewed-by: Jennifer A. Stofer Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/79902 Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Tested-by: FSP CI Jenkins --- src/import/tools/genMemVpd.pl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/import/tools/genMemVpd.pl b/src/import/tools/genMemVpd.pl index 3fce7c6e9..e9a8639e9 100755 --- a/src/import/tools/genMemVpd.pl +++ b/src/import/tools/genMemVpd.pl @@ -494,10 +494,11 @@ sub processCkeVpdTextFile my $actionWriteFile=0; my $line = ; + $line =~ s/(\r|\n)//g; + $row++; if ($line) #determine all actions based on text line { - chomp($line); if ($line =~ /ATTR_/) #first since will be the most of these { if ($stateProcHeader) @@ -605,10 +606,11 @@ sub processVpdTextFile my $actionWriteFile=0; my $line = ; + $line =~ s/(\r|\n)//g; + $row++; if ($line) #determine all actions based on text line { - chomp($line); if ($line =~ /ATTR_/) #first since will be the most of these { if ($stateProcHeader) -- cgit v1.2.1