From c8da4f67f29beffc5032debe1e4df69f57f2146a Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 2 Sep 2009 15:16:05 +0000
Subject: [PATCH] -Change order of template directive processing to match 1.x
 for those who rely upon that ordering

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4080 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 perl-xCAT/xCAT/Template.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/perl-xCAT/xCAT/Template.pm b/perl-xCAT/xCAT/Template.pm
index 56b8e8e74..4ced01d63 100644
--- a/perl-xCAT/xCAT/Template.pm
+++ b/perl-xCAT/xCAT/Template.pm
@@ -68,12 +68,12 @@ sub subvars {
     }
   }
   #ok, now do everything else..
-  $inc =~ s/#COMMAND:([^#]+)#/command($1)/eg;
+  $inc =~ s/#XCATVAR:([^#]+)#/envvar($1)/eg;
+  $inc =~ s/#ENV:([^#]+)#/envvar($1)/eg;
   $inc =~ s/#TABLE:([^:]+):([^:]+):([^#]+)#/tabdb($1,$2,$3)/eg;
   $inc =~ s/#TABLEBLANKOKAY:([^:]+):([^:]+):([^#]+)#/tabdb($1,$2,$3,'1')/eg;
   $inc =~ s/#CRYPT:([^:]+):([^:]+):([^#]+)#/crydb($1,$2,$3)/eg;
-  $inc =~ s/#XCATVAR:([^#]+)#/envvar($1)/eg;
-  $inc =~ s/#ENV:([^#]+)#/envvar($1)/eg;
+  $inc =~ s/#COMMAND:([^#]+)#/command($1)/eg;
   $inc =~ s/#INCLUDE_NOP:([^#]+)#/includefile($1,1)/eg;
 
   if ($tmplerr) {