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

Grouped /^(fsp|bpa)$/ in regexp

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@1097 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
sakolish 2008-04-16 18:00:18 +00:00
parent 8ebb907eed
commit 3281adc8a2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
perl-xCAT-2.0/xCAT/PPCpower.pm
View File

@ -21,8 +21,8 @@ sub parse_args {
# Responds with usage statement
#############################################
local *usage = sub {
my $usage_string=xCAT::Usage->getUsage($command);
return( [ $_[0], $usage_string]);
my $usage_string = xCAT::Usage->getUsage($command);
return( [ $_[0], $usage_string] );
};
#############################################
# Process command-line arguments
@ -117,7 +117,7 @@ sub enumerate {
##############################
# No lparid for fsp/bpa
##############################
if ( $type =~ /^fsp|bpa$/ ) {
if ( $type =~ /^(fsp|bpa)$/ ) {
$lparid = $type;
}
$outhash{ $lparid } = $state;
@ -160,7 +160,7 @@ sub powercmd_boot {
# Look up by lparid
##################################
my $type = @$d[4];
my $id = ($type=~/^fsp|bpa$/) ? $type : @$d[0];
my $id = ($type=~/^(fsp|bpa)$/) ? $type : @$d[0];
##################################
# Output error
@ -180,7 +180,7 @@ sub powercmd_boot {
# Convert state to on/off
##################################
my $state = power_status($data->{$id});
my $op = ($state =~ /^Off|Not Activated$/) ? "on" : "reset";
my $op = ($state =~ /^(Off|Not Activated)$/) ? "on" : "reset";
##############################
# Send power command
@ -276,7 +276,7 @@ sub state {
# Look up by lparid
##################################
my $type = @$d[4];
my $id = ($type=~/^fsp|bpa$/) ? $type : @$d[0];
my $id = ($type=~/^(fsp|bpa)$/) ? $type : @$d[0];
##################################
# Output error