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

-Comment out use xCAT::NodeRange in Client.pm, where it only is needed for XCATBYPASSMODE

Browse Source 
-Attempt to improve the conditional module importing semantics to work correctly


git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@912 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2008-03-27 15:32:21 +00:00
parent 5960171fb2
commit 2c9963ebed
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
perl-xCAT-2.0/xCAT/Client.pm
View File

@ -4,12 +4,16 @@ package xCAT::Client;
BEGIN
{
$::XCATROOT = $ENV{'XCATROOT'} ? $ENV{'XCATROOT'} : -d '/opt/xcat' ? '/opt/xcat' : '/usr';
}
use lib "$::XCATROOT/lib/perl";
if ($ENV{XCATBYPASS}) {
require xCAT::NodeRange;
require xCAT::Utils;
require xCAT::Table;
require lib;
lib->import("$::XCATROOT/lib/perl");
if ($ENV{XCATBYPASS}) {
require xCAT::NodeRange;
xCAT::NodeRange->import;
require xCAT::Utils;
xCAT::Utils->import;
require xCAT::Table;
xCAT::Table->import;
}
}
my $inet6support;
@ -196,7 +200,7 @@ sub plugin_command {
my $sock = shift;
my $callback = shift;
my %handler_hash;
use xCAT::NodeRange;
#use xCAT::NodeRange;
$Main::resps={};
my @nodes;
if ($req->{node}) {