diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2003-09-10 15:21:52 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2003-09-10 15:21:52 +0000 |
| commit | 4593eab609a0204b269ec27fa67955fd2f32d752 (patch) | |
| tree | 44eab33bcce747ed6c5bf78b8e58bc939ea4ea15 | |
| parent | 041ba9485f35697c32341d191e468f7ec22402a0 (diff) | |
| download | ATCD-4593eab609a0204b269ec27fa67955fd2f32d752.tar.gz | |
ChangeLogTag: Wed Sep 10 10:21:16 2003 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/modules/WorkspaceCreator.pm | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 0ff38d9ea66..9e5087ca666 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Sep 10 10:21:16 2003 Chad Elliott <elliott_c@ociweb.com> + + * bin/MakeProjectCreator/modules/WorkspaceCreator.pm: + + Fixed a logic error when filtering out circular dependencies. + Wed Sep 10 10:07:43 2003 Chad Elliott <elliott_c@ociweb.com> * bin/MakeProjectCreator/config/avstreams.mpb: diff --git a/bin/MakeProjectCreator/modules/WorkspaceCreator.pm b/bin/MakeProjectCreator/modules/WorkspaceCreator.pm index d4c62c6a90c..57ef2cb0726 100644 --- a/bin/MakeProjectCreator/modules/WorkspaceCreator.pm +++ b/bin/MakeProjectCreator/modules/WorkspaceCreator.pm @@ -984,8 +984,8 @@ sub sort_dependencies { ## See if the dependency is listed after this project for(my $j = $i; $j <= $#list; ++$j) { if ($i != $j && $list[$j] eq $full && - $list[$i] ne $moved_project && - $list[$j] ne $start_project) { + ($list[$i] ne $moved_project || + $list[$j] ne $start_project)) { ## Keep track of the one we started with and the ## one we are going to move. If there is a circular ## dependency, the next time through we will catch it. |