ChangeLogTag: Mon Jun 14 22:06:56 UTC 2010 Chad Elliott <elliott_c@ociweb.com>

2 files changed, 14 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 9980dc2d..3ce707c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Jun 14 22:06:56 UTC 2010  Chad Elliott  <elliott_c@ociweb.com>
+
+        * modules/ProjectCreator.pm:
+
+          Only replace psuedo variables on actual keywords during variable
+          modification.  User defined keywords must not have the parameters
+          replaced in order for them to get the correct replacement values
+          later on.
+
 Wed Jun  9 07:35:19 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * templates/vc8.mpd:
diff --git a/modules/ProjectCreator.pm b/modules/ProjectCreator.pm
index ad7979b2..d454d3b8 100644
--- a/modules/ProjectCreator.pm
+++ b/modules/ProjectCreator.pm
@@ -456,10 +456,11 @@ sub process_assignment {
     }
 
     ## If the assignment name is valid and requires parameter (<%...%>)
-    ## replacement, then do so.
-    if (defined $self->{'valid_names'}->{$name} &&
-        ($self->{'valid_names'}->{$name} & 0x04) == 0 &&
-        index($value, '<%') >= 0) {
+    ## replacement, then do so.  But, only do so on actual keywords. 
+    ## User defined keywords must not have the parameters replaced in
+    ## order for them to get the correct replacement values later on.
+    if (defined $validNames{$name} &&
+        ($validNames{$name} & 0x04) == 0 && index($value, '<%') >= 0) {
       $value = $self->replace_parameters($value, $self->{'command_subs'});
     }
   }