Fix bmake generation test failures. Thanks to Chad Elliott for notifying about

the tests and Adam Mitz for debugging the issue.

2 files changed, 8 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index c46b5099..ed216f2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-Tue Jun 29 14:45:21 UTC 2010  Chris Cleeland  <cleeland@bobke2.local>
+Tue Jun 29 18:18:56 UTC 2010  Chris Cleeland  <cleeland@ociweb.com>
+
+        * modules/TemplateParser.pm: split_parameters() was returning an
+        empty parameter.  This should fix errant extra whitespace
+        generated in bmake test output.
+
+Tue Jun 29 14:45:21 UTC 2010  Chris Cleeland  <cleeland@ociweb.com>
 
         * templates/cdt6platforms.mpt:
         * templates/cdt6dll.mpt:
diff --git a/modules/TemplateParser.pm b/modules/TemplateParser.pm
index cfdf4b50..4c296d0c 100644
--- a/modules/TemplateParser.pm
+++ b/modules/TemplateParser.pm
@@ -251,7 +251,7 @@ sub split_parameters {
 
   ## Return the parameters (which includes whatever is left in the
   ## string).  Just return it instead of pushing it onto @params.
-  return @params, $str;
+  return ($str eq '') ? @params : (@params, $str);
 }