summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarty Gloff <mgloff@us.ibm.com>2016-07-22 15:25:20 -0500
committerDaniel M. Crowell <dcrowell@us.ibm.com>2016-07-26 13:10:18 -0400
commit851467dd485ccfa61c4039f347ebe490173f859c (patch)
treedeaa42e99203a9361a809c45e74bcb0d40ceb9c4
parent07dec10d6cd1a4fe32a3fa9bf6a631a826da50bd (diff)
downloadtalos-hostboot-851467dd485ccfa61c4039f347ebe490173f859c.tar.gz
talos-hostboot-851467dd485ccfa61c4039f347ebe490173f859c.zip
Correction to fix temporary attribute script
Modify check for enums without a value (like C++) Change-Id: Ic39c7ec00d74fc97d374886407db220ef3eaf29f Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/27386 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com> Reviewed-by: Matt Derksen <v2cibmd@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
-rwxr-xr-xsrc/usr/targeting/xmltohb/updatetempsxml.pl8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/usr/targeting/xmltohb/updatetempsxml.pl b/src/usr/targeting/xmltohb/updatetempsxml.pl
index b28b26d22..5e5205651 100755
--- a/src/usr/targeting/xmltohb/updatetempsxml.pl
+++ b/src/usr/targeting/xmltohb/updatetempsxml.pl
@@ -85,13 +85,16 @@ open (FH, "<$generic") ||
die "ERROR: unable to open $generic\n";
close (FH);
+#print STDERR "XMLin($generic)\n";
my $genericXml = XMLin("$generic");
+#print STDERR "XMLin($generic, ForceArray=>1)\n";
my $genericXmlArray = XMLin("$generic", ForceArray=>1);
open (FH, "<$fapi") ||
die "ERROR: unable to open $fapi\n";
close (FH);
+#print STDERR "XMLin($fapi, ForceArray=>1)\n";
my $fapiXml = XMLin("$fapi", ForceArray=>1);
open (FH, "<$fapi_inc") ||
@@ -102,12 +105,14 @@ open (FH, "<$fw_dflts") ||
die "ERROR: unable to open $fw_dflts\n";
close (FH);
+#print STDERR "XMLin($fw_dflts, ForceArray=>1)\n";
my $fwDfltsXml = XMLin("$fw_dflts", ForceArray=>1);
open (FH, "<$defaults") ||
die "ERROR: unable to open $defaults\n";
close (FH);
+#print STDERR "XMLin($defaults, ForceArray=>1)\n";
my $defaultsXml = XMLin("$defaults", ForceArray=>1);
@@ -312,10 +317,11 @@ foreach my $TempAttr ( @{$fwDfltsXml->{attribute}} )
$enum_defs[$i] =~ /^\s*(.*)\s*=\s*(.*)\s*/;
my $enumName = $1;
my $enumValue = $2;
- unless ($enumValue) # non-specified enum values (first enum = 0)
+ if ($enumValue eq "") # non-specified enum values (first enum = 0)
{
($enumName) = $enum_defs[$i] =~ m/^\s*(.*)\s*/;
$enumValue = 1 + $previous_value;
+# print STDERR "Update enum $enumName with value $enumValue\n";
}
$previous_value = $enumValue;
$enumName =~ s/ //;
OpenPOWER on IntegriCloud