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

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

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@1101 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
sakolish 2008-04-16 18:10:41 +00:00
parent 55ffffed5c
commit ff1fc8d598
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
perl-xCAT-2.0/xCAT/PPCvm.pm
View File

@ -49,8 +49,8 @@ sub chvm_parse_args {
# Responds with usage statement
#############################################
local *usage = sub {
my $usage_string=xCAT::Usage->getUsage($cmd);
return( [ $_[0], $usage_string]);
my $usage_string = xCAT::Usage->getUsage($cmd);
return( [ $_[0], $usage_string] );
};
####################################
# Configuration file required
@ -111,8 +111,8 @@ sub mkvm_parse_args {
# Responds with usage statement
#############################################
local *usage = sub {
my $usage_string=xCAT::Usage->getUsage($cmd);
return( [ $_[0], $usage_string]);
my $usage_string = xCAT::Usage->getUsage($cmd);
return( [ $_[0], $usage_string] );
};
#############################################
# Process command-line arguments
@ -148,7 +148,7 @@ sub mkvm_parse_args {
# Check for non-zero integer
####################################
if ( exists( $opt{i} )) {
if ( $opt{i} !~ /^[1-9]{1}|[1-9]{1}[0-9]+$/ ) {
if ( $opt{i} !~ /^([1-9]{1}|[1-9]{1}[0-9]+)$/ ) {
return(usage( "Invalid entry: $opt{i}" ));
}
@ -196,8 +196,8 @@ sub rmvm_parse_args {
# Responds with usage statement
#############################################
local *usage = sub {
my $usage_string=xCAT::Usage->getUsage($cmd);
return( [ $_[0], $usage_string]);
my $usage_string = xCAT::Usage->getUsage($cmd);
return( [ $_[0], $usage_string] );
};
#############################################
# Process command-line arguments
@ -252,8 +252,8 @@ sub lsvm_parse_args {
# Responds with usage statement
#############################################
local *usage = sub {
my $usage_string=xCAT::Usage->getUsage($cmd);
return( [ $_[0], $usage_string]);
my $usage_string = xCAT::Usage->getUsage($cmd);
return( [ $_[0], $usage_string] );
};
#############################################
# Process command-line arguments
@ -504,7 +504,7 @@ sub remove {
####################################
# Must be CEC or LPAR
####################################
if ( $type !~ /^lpar|fsp$/ ) {
if ( $type !~ /^(lpar|fsp)$/ ) {
push @values, [$lpar, "Node must be LPAR or CEC", RC_ERROR];
next;
}
@ -655,7 +655,7 @@ sub list {
####################################
# Must be CEC or LPAR
####################################
if ( $type !~ /^lpar|fsp$/ ) {
if ( $type !~ /^(lpar|fsp)$/ ) {
push @values, [$lpar,"Node must be LPAR or CEC",RC_ERROR];
next;
}
@ -750,7 +750,7 @@ sub create {
#####################################
# Must be CEC or LPAR
#####################################
if ( $type !~ /^lpar|fsp$/ ) {
if ( $type !~ /^(lpar|fsp)$/ ) {
push @values, [$lpar,"Node must be LPAR or CEC",RC_ERROR];
next;
}
@ -972,3 +972,4 @@ sub lsvm {