arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix defect 4309 lskitdeployparam -k returns kit plugin bug

Browse Source
This commit is contained in:
baiyuan 2014-10-23 05:19:46 -04:00
parent 50a441209b
commit ae11f1f4fe
1 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
xCAT-server/lib/xcat/plugins/kit.pm
View File

@ -4356,20 +4356,35 @@ sub lskitdeployparam {
foreach my $kit (@$kits) {
my $deployparam_file = $kit->{kitdir}."/other_files/".$kit->{kitdeployparams};
my $tmpkitdeployparames = $kit->{kitdeployparams};
if (defined($deployparam_file)) {
open(my $fh, "<", $deployparam_file) || die sprintf("Failed to open file %s because: %s", $deployparam_file, $!);
# Check if there is kitdeployparam file or not
if (defined($tmpkitdeployparames))
{
open(my $fh, "<", $deployparam_file) || die sprintf("Failed to open file %s because: %s", $deployparam_file, $!);
while (<$fh>) {
chomp $_;
if ($_ =~ /^#ENV:.+=.+#$/) {
my $tmp = $_;
$tmp =~ s/^#ENV://;
$tmp =~ s/#$//;
(my $name, my $value) = split(/=/, $tmp);
$deployparam_hash->{$name} = $value;
}
}
close($fh);
while (<$fh>) {
chomp $_;
if ($_ =~ /^#ENV:.+=.+#$/) {
my $tmp = $_;
$tmp =~ s/^#ENV://;
$tmp =~ s/#$//;
(my $name, my $value) = split(/=/, $tmp);
$deployparam_hash->{$name} = $value;
}
}
close($fh);
}
else {
my $rsp = {};
push @{ $rsp->{data}}, "There is no kitdeployparams file in $deployparam_file.\n";
xCAT::MsgUtils->message("W", $rsp, $::CALLBACK);
return 1;
}
}
}