diff options
author | Matt Derksen <v2cibmd@us.ibm.com> | 2016-10-13 09:12:33 -0500 |
---|---|---|
committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2019-07-03 08:35:33 -0500 |
commit | a59fbce9c9541802d04ff952d1a9371c5cdec91e (patch) | |
tree | 05d35b151934229b1ea09fbb1ff66ae8e232f879 /src/import/tools | |
parent | 9c1f3e24b6e424cb73d2d97e2629910346b3ef9a (diff) | |
download | blackbird-hostboot-a59fbce9c9541802d04ff952d1a9371c5cdec91e.tar.gz blackbird-hostboot-a59fbce9c9541802d04ff952d1a9371c5cdec91e.zip |
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 <dcrowell@us.ibm.com>
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: BRADLEY REID <breid@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/79902
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Diffstat (limited to 'src/import/tools')
-rwxr-xr-x | src/import/tools/genMemVpd.pl | 6 |
1 files 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 = <VPDINPUTTEXT>; + $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 = <VPDINPUTTEXT>; + $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) |