From cb482e73f8e4ebbf4d83dfd9dea6872e20773b34 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 14 Jun 2012 18:43:11 +0000
Subject: [PATCH] Further refinement of FSM build

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13099 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 perl-xCAT/perl-xCAT.spec | 3 ++-
 perl-xCAT/xCAT/Utils.pm  | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/perl-xCAT/perl-xCAT.spec b/perl-xCAT/perl-xCAT.spec
index 52808a63a..a8fb455f5 100644
--- a/perl-xCAT/perl-xCAT.spec
+++ b/perl-xCAT/perl-xCAT.spec
@@ -74,7 +74,6 @@ rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/hpoa.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/hpoa.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/vboxService.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/FSP*.pm
-rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/RemoteShellExp.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/PPC*.pm
 # have to put PPCdb.pm back because it is needed by Postage.pm
 cp xCAT/PPCdb.pm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/
@@ -85,6 +84,8 @@ chmod 644 $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/PPCdb.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/hpoa.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/vboxService.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/FSP*.pm
+rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/RemoteShellExp.pm
+rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/LparNetbootExp.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/PPC*.pm
 # have to put PPCdb.pm back because it is needed by Postage.pm
 cp xCAT/PPCdb.pm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/
diff --git a/perl-xCAT/xCAT/Utils.pm b/perl-xCAT/xCAT/Utils.pm
index 8c9e81623..fa5757bdf 100644
--- a/perl-xCAT/xCAT/Utils.pm
+++ b/perl-xCAT/xCAT/Utils.pm
@@ -28,7 +28,9 @@ use Digest::SHA1 qw/sha1/;
 use IPC::Open3;
 use IO::Select;
 use xCAT::GlobalDef;
-require xCAT::RemoteShellExp;
+eval {
+  require xCAT::RemoteShellExp;
+};
 use warnings "all";
 require xCAT::InstUtils;
 require xCAT::NetworkUtils;