From fbe2127538eb8c46a87eede606c8b9691f044a51 Mon Sep 17 00:00:00 2001 From: sakolish Date: Wed, 16 Apr 2008 18:03:41 +0000 Subject: [PATCH] Grouped /^(hmc|ivm)$/ in regexp git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@1099 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- perl-xCAT-2.0/xCAT/PPCscan.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/perl-xCAT-2.0/xCAT/PPCscan.pm b/perl-xCAT-2.0/xCAT/PPCscan.pm index 0fe9b7335..6b5ac3d53 100644 --- a/perl-xCAT-2.0/xCAT/PPCscan.pm +++ b/perl-xCAT-2.0/xCAT/PPCscan.pm @@ -47,8 +47,8 @@ sub 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 @@ -404,7 +404,7 @@ sub format_output { # hardware control address ############################### if ( @$_[0] eq "address" ) { - if ( $data[0] !~ /^hmc|ivm$/ ) { + if ( $data[0] !~ /^(hmc|ivm)$/ ) { $d = $data[8]; } } @@ -468,7 +468,7 @@ sub format_stanza { $d = "$type,all"; } elsif ( /^mgt$/ ) { $d = $hwtype; - } elsif ( /^mtm|serial$/ ) { + } elsif ( /^(mtm|serial)$/ ) { if ( $type eq "lpar" ) { $d = undef; } @@ -526,7 +526,7 @@ sub format_xml { $d = "$type,all"; } elsif ( /^mgt$/ ) { $d = $hwtype; - } elsif ( /^mtm|serial$/ ) { + } elsif ( /^(mtm|serial)$/ ) { if ( $type eq "lpar" ) { $d = undef; }