From 4fd1fd364ac542895eb62fd3467a3077feaf5729 Mon Sep 17 00:00:00 2001
From: lissav <lissav@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 8 Jun 2012 11:47:04 +0000
Subject: [PATCH] change order of checking for fanout

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13046 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-client/bin/prsync | 6 +++---
 xCAT-client/bin/pscp   | 6 +++---
 xCAT-client/bin/psh    | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/xCAT-client/bin/prsync b/xCAT-client/bin/prsync
index d5233940e..2988aec07 100755
--- a/xCAT-client/bin/prsync
+++ b/xCAT-client/bin/prsync
@@ -54,12 +54,12 @@ if ($version) {
 }
 my $pshmaxp = 64; 
 # determine fanout
+if ($ENV{XCATPSHFANOUT}) {  
+  $pshmaxp=$ENV{XCATPSHFANOUT};
+}
 if ($fanout) {  # see if they overroad the fanout from the command line
   $pshmaxp=$fanout;
 }
-if ($ENV{XCATPSHFANOUT}) {  # env variable rules
-  $pshmaxp=$ENV{XCATPSHFANOUT};
-}
 (my $noderange,my $destloc) = split(/:/,$ARGV[1]);
 my @user = getpwuid($>);
 my $homedir=$user[7];
diff --git a/xCAT-client/bin/pscp b/xCAT-client/bin/pscp
index bb405cc2e..ee3e7c2c6 100755
--- a/xCAT-client/bin/pscp
+++ b/xCAT-client/bin/pscp
@@ -34,12 +34,12 @@ sub usage
 }
 
 my $pshmaxp = 64; 
+if ($ENV{XCATPSHFANOUT}) {  
+  $pshmaxp=$ENV{XCATPSHFANOUT};
+}
 if ($fanout) {  # see if they overroad the fanout from the command line
   $pshmaxp=$fanout;
 }
-if ($ENV{XCATPSHFANOUT}) {  # env variable rules
-  $pshmaxp=$ENV{XCATPSHFANOUT};
-}
 
 
 # Processing arguments
diff --git a/xCAT-client/bin/psh b/xCAT-client/bin/psh
index f69144360..f32b9bc60 100755
--- a/xCAT-client/bin/psh
+++ b/xCAT-client/bin/psh
@@ -35,16 +35,16 @@ if (!GetOptions(
 }
 my %nodehdl;
 my $xcathost='localhost:3001';
-my $pshmaxp = 64; #TODO: should this be server dictated or local conf?
+my $pshmaxp = 64; 
 if ($ENV{XCATHOST}) {
   $xcathost=$ENV{XCATHOST};
 }
+if ($ENV{XCATPSHFANOUT}) {  
+  $pshmaxp=$ENV{XCATPSHFANOUT};
+}
 if ($fanout) {  # see if they overroad the fanout from the command line
   $pshmaxp=$fanout;
 }
-if ($ENV{XCATPSHFANOUT}) {  # env variable rules
-  $pshmaxp=$ENV{XCATPSHFANOUT};
-}
 my $noderange = $ARGV[0];
 my @nodes=();