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

#4262 The type of error message in rmosdistro is not string ref

Browse Source
This commit is contained in:
immarvin 2014-09-02 01:54:01 -07:00
parent 201fb1871b
commit 8a6b60a769
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
xCAT-server/lib/xcat/plugins/osdistro.pm
View File

@ -157,7 +157,7 @@ sub rmosdistro
if ($help) {
$callback->({info=>"rmosdistro [{-a|--all}] [-f|--force] [osdistroname] ...",errorcode=>[0]});
$callback->({info=>["rmosdistro [{-a|--all}] [-f|--force] [osdistroname] ..."],errorcode=>[0]});
return;
}
@ -165,7 +165,7 @@ sub rmosdistro
{
unless(scalar @ARGV)
{
$callback->({info=>"please specify osdistroname to remove, or specify \"-a|--all\" to remove all osdistros ",errorcode=>[1]});
$callback->({info=>["please specify osdistroname to remove, or specify \"-a|--all\" to remove all osdistros "],errorcode=>[1]});
return;
}
#if any osdistro has been specified,push it into array
@ -175,7 +175,7 @@ sub rmosdistro
my $osdistrotab = xCAT::Table->new('osdistro',-create=>1);
unless($osdistrotab)
{
$callback->({error=>"rmosdistro: failed to open table 'osdistro'!",errorcode=>[1]});
$callback->({error=>["rmosdistro: failed to open table 'osdistro'!"],errorcode=>[1]});
return;
}
@ -202,7 +202,7 @@ sub rmosdistro
$osimagetab=xCAT::Table->new('osimage');
unless($osimagetab)
{
$callback->({error=>"rmosdistro: failed to open table 'osimage'!",errorcode=>[1]});
$callback->({error=>["rmosdistro: failed to open table 'osimage'!"],errorcode=>[1]});
$osdistrotab->close();
return;
}
@ -217,7 +217,7 @@ sub rmosdistro
my $result=&getOSdistroref($osimagetab,$_);
if($result)
{
$callback->({error=>"rmosdistro: failed to remove $_, it is referenced by osimages:\n$result\nretry with -f option !",errorcode=>[1]});
$callback->({error=>["rmosdistro: failed to remove $_, it is referenced by osimages:\n$result\nretry with -f option !"],errorcode=>[1]});
next;
}
}
@ -227,7 +227,7 @@ sub rmosdistro
my $result=$osdistrotab->getAttribs(\%keyhash,'dirpaths','basename','majorversion','minorversion','arch');
unless($result)
{
$callback->({error=>"rmosdistro: $keyhash{osdistroname} not exist!",errorcode=>[1]});
$callback->({error=>["rmosdistro: $keyhash{osdistroname} not exist!"],errorcode=>[1]});
next;
}
@ -239,7 +239,7 @@ sub rmosdistro
system("rm -rf $result->{'dirpaths'}");
if($? != 0)
{
$callback->({error=>"rmosdistro: failed to remove $keyhash{osdistroname} directory!",errorcode=>[1]});
$callback->({error=>["rmosdistro: failed to remove $keyhash{osdistroname} directory!"],errorcode=>[1]});
next;
}
}