From 2c9963ebed1d15ce7868cf0697e7873293413176 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 27 Mar 2008 15:32:21 +0000
Subject: [PATCH] -Comment out use xCAT::NodeRange in Client.pm, where it only
 is needed for XCATBYPASSMODE -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
---
 perl-xCAT-2.0/xCAT/Client.pm | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/perl-xCAT-2.0/xCAT/Client.pm b/perl-xCAT-2.0/xCAT/Client.pm
index 1b5e77ced..4ec604fd0 100644
--- a/perl-xCAT-2.0/xCAT/Client.pm
+++ b/perl-xCAT-2.0/xCAT/Client.pm
@@ -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}) {