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

fix several issues working with NIM Prime

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4692 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
ligc 2009-11-30 09:40:53 +00:00
parent c07e6a6ac2
commit 7b76695826
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
perl-xCAT/xCAT/InstUtils.pm
View File

@ -267,8 +267,14 @@ sub get_nim_attr_val
return undef;
}
my ($junk, $junk, $junk, $loc) = split(/:/, $nout);
chomp $loc;
# The command output may have the xdsh prefix "target:"
#my ($junk, $junk, $junk, $loc) = split(/:/, $nout);
#chomp $loc;
my $loc;
if ($nout =~ /.*$resname:(.*):$/)
{
$loc = $1;
}
return $loc;
}
@ -388,22 +394,24 @@ sub readBNDfile
xCAT::InstUtils->get_nim_attr_val($BNDname, 'location', $callback,
$nimprime, $sub_req);
# open the file
unless (open(BNDFILE, "<$bnd_file_name"))
{
return (1);
# The boundle file may be on nimprime
my $ccmd = qq~cat $bnd_file_name~;
my $output=xCAT::InstUtils->xcmd($callback, $sub_req, "xdsh", $nimprime, $ccmd, 0);
if ($::RUNCMD_RC != 0) {
my $rsp;
push @{$rsp->{data}}, "Command: $ccmd failed.";
xCAT::MsgUtils->message("E", $rsp, $callback);
}
# get the names of the packages
while (my $l = <BNDFILE>)
#$output =~ s/$nimprime:\s+//g;
foreach my $line (split(/\n/, $output))
{
chomp $l;
#May include xdsh prefix $nimprime:
$line =~ s/$nimprime:\s+//;
# skip blank and comment lines
next if ($l =~ /^\s*$/ || $l =~ /^\s*#/);
push(@pkglist, $l);
next if ($line =~ /^\s*$/ || $line =~ /^\s*#/);
push(@pkglist, $line);
}
close(BNDFILE);