diff options
author | elliott_c <ocielliottc@users.noreply.github.com> | 2003-04-30 14:39:06 +0000 |
---|---|---|
committer | elliott_c <ocielliottc@users.noreply.github.com> | 2003-04-30 14:39:06 +0000 |
commit | e5edc686018e554c72b5b49c383fd4a34525026d (patch) | |
tree | 48ebc0792b6a63a94eb7432e50d6f81ec3ce9adb | |
parent | 46875a42f1142c113489ed8034b5b0f025fd4a4f (diff) | |
download | MPC-e5edc686018e554c72b5b49c383fd4a34525026d.tar.gz |
ChangeLogTag: Wed Apr 30 09:38:19 2003 Chad Elliott <elliott_c@ociweb.com>
-rw-r--r-- | modules/WorkspaceCreator.pm | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/modules/WorkspaceCreator.pm b/modules/WorkspaceCreator.pm index 331a5a4d..170707b5 100644 --- a/modules/WorkspaceCreator.pm +++ b/modules/WorkspaceCreator.pm @@ -241,34 +241,32 @@ sub parse_exclude { my($errorString) = 'ERROR: Unable to process exclude'; if ($typestr eq 'default') { - $errorString = 'ERROR: You must specify a project type ' . - 'for exclusions'; + $typestr = $self->{'wctype'}; } - else { - my(@types) = split(/\s*,\s*/, $typestr); - my(@exclude) = (); - while(<$fh>) { - my($line) = $self->strip_line($_); + my(@types) = split(/\s*,\s*/, $typestr); + my(@exclude) = (); - if ($line eq '') { - } - elsif ($line =~ /^}/) { - $status = 1; - $errorString = ''; - last; - } - else { - push(@exclude, $line); - } + while(<$fh>) { + my($line) = $self->strip_line($_); + + if ($line eq '') { } + elsif ($line =~ /^}/) { + $status = 1; + $errorString = ''; + last; + } + else { + push(@exclude, $line); + } + } - foreach my $type (@types) { - if (!defined $self->{'exclude'}->{$type}) { - $self->{'exclude'}->{$type} = []; - } - push(@{$self->{'exclude'}->{$type}}, @exclude); + foreach my $type (@types) { + if (!defined $self->{'exclude'}->{$type}) { + $self->{'exclude'}->{$type} = []; } + push(@{$self->{'exclude'}->{$type}}, @exclude); } return $status, $errorString; |