summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChad Elliott <elliottc@objectcomputing.com>2019-07-01 13:37:57 -0500
committerChad Elliott <elliottc@objectcomputing.com>2019-07-01 13:37:57 -0500
commit81bcbb2a39e3be1e588d1f12399c79a2ffc8284f (patch)
tree717bc1d97c2b807f07ed6b710ecb2dbf2ae020d0
parentc8e2f48e87161dac7cf8780dbcbf84b1db34ee6c (diff)
downloadMPC-81bcbb2a39e3be1e588d1f12399c79a2ffc8284f.tar.gz
Mon Jul 1 18:35:43 UTC 2019 Chad Elliott <elliottc@objectcomputing.com>ocitao22ap16MPC_4_1_44ACE+TAO-6_5_6
-rw-r--r--ChangeLog7
-rw-r--r--modules/TemplateParser.pm2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b7e7d6a8..4348d0e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jul 1 18:35:43 UTC 2019 Chad Elliott <elliottc@objectcomputing.com>
+
+ * modules/TemplateParser.pm:
+
+ Check the result of file_sorter() since it does not return
+ true/false, it returns -1,0,1.
+
Fri Jun 28 15:52:37 UTC 2019 Chad Elliott <elliottc@objectcomputing.com>
* modules/TemplateParser.pm:
diff --git a/modules/TemplateParser.pm b/modules/TemplateParser.pm
index 33516751..0544f5d7 100644
--- a/modules/TemplateParser.pm
+++ b/modules/TemplateParser.pm
@@ -2053,7 +2053,7 @@ sub doif_is_custom_input {
## exist (which isn't guaranteed at project generation time). So,
## we do the minimal comparison using the file_sorter on the
## ProjectCreator to handle case sensitivity automatically.
- return 1 if ($self->{'prjc'}->file_sorter($input, $val));
+ return 1 if ($self->{'prjc'}->file_sorter($input, $val) == 0);
}
}