diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/modules/Creator.pm | 14 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/modules/Driver.pm | 3 |
3 files changed, 22 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index c7e28f38249..2f637501675 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Thu May 1 10:32:26 2003 Chad Elliott <elliott_c@ociweb.com> + + * bin/MakeProjectCreator/modules/Creator.pm: + * bin/MakeProjectCreator/modules/Driver.pm: + + Fixed the process return value for when the default input is used. + It was hard coded to always return 1 and did not take into account + that a default workspace could have mpc files that do not evaluate + properly. + Thu May 1 07:09:07 2003 Chad Elliott <elliott_c@ociweb.com> * bin/MakeProjectCreator/modules/StringProcessor.pm: diff --git a/bin/MakeProjectCreator/modules/Creator.pm b/bin/MakeProjectCreator/modules/Creator.pm index 99de89b863c..15a7c0f7abc 100644 --- a/bin/MakeProjectCreator/modules/Creator.pm +++ b/bin/MakeProjectCreator/modules/Creator.pm @@ -98,10 +98,16 @@ sub collect_line { sub generate_default_input { - my($self) = shift; - $self->parse_line(undef, "$self->{'grammar_type'} {"); - $self->parse_line(undef, '}'); - return 1; + my($self) = shift; + my($status) = 0; + my($error) = ''; + + ## We are throwing away the error string. In both Workspace and + ## Project creators, we don't care about this error string just the + ## status. + ($status, $error) = $self->parse_line(undef, "$self->{'grammar_type'} {"); + ($status, $error) = $self->parse_line(undef, '}'); + return $status; } diff --git a/bin/MakeProjectCreator/modules/Driver.pm b/bin/MakeProjectCreator/modules/Driver.pm index 8f4d43a53cb..91c70830a5d 100644 --- a/bin/MakeProjectCreator/modules/Driver.pm +++ b/bin/MakeProjectCreator/modules/Driver.pm @@ -324,7 +324,8 @@ sub run { ($file eq '' ? 'default input' : $file) . "\n"; print 'Start Time: ' . scalar(localtime(time())) . "\n"; if (!$generator->generate($file)) { - print STDERR "ERROR: Unable to process: $file\n"; + print STDERR "ERROR: Unable to process: " . + ($file eq '' ? 'default input' : $file) . "\n"; $status++; last; } |