Skip to content

Commit

Permalink
Updated genMemVpd.pl to strip carriage returns from line data
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Matt Derksen authored and dcrowell77 committed Jul 3, 2019
1 parent 9c1f3e2 commit a59fbce
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/import/tools/genMemVpd.pl
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit a59fbce

Please sign in to comment.