ChangeLogTag: Mon Nov 14 07:40:19 2005 Chad Elliott <elliott_c@ociweb.com>

2 files changed, 31 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 70da2e3e..f4b08e35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Nov 14 07:40:19 2005  Chad Elliott  <elliott_c@ociweb.com>
+
+        * modules/WorkspaceCreator.pm:
+
+          Fixed a bug where sorting the projects (with a circular
+          dependency) would run infinitely.  This was identical to the
+          problem fixed on Thu Apr 15 13:16:03 2004 just in a different
+          scenario.
+
 Thu Nov 10 12:23:43 2005  Chad Elliott  <elliott_c@ociweb.com>
 
         * modules/TemplateParser.pm:
diff --git a/modules/WorkspaceCreator.pm b/modules/WorkspaceCreator.pm
index 19a551ca..808a0091 100644
--- a/modules/WorkspaceCreator.pm
+++ b/modules/WorkspaceCreator.pm
@@ -953,15 +953,7 @@ sub generate_hierarchy {
   ## It is necessary to sort the projects to get the correct ordering.
   ## Projects in the current directory must come before projects in
   ## other directories.
-  my(@projects)  = sort { my($sa) = ($a =~ /\//);
-                          my($sb) = ($b =~ /\//);
-                          if ($sa && !$sb) {
-                            return 1;
-                          }
-                          elsif ($sb && !$sa) {
-                            return -1;
-                          }
-                          return $a cmp $b;
+  my(@projects)  = sort { return $self->sort_projects_by_directory($a, $b) + 0;
                         } @{$origproj};
   my(%projinfo)  = %{$originfo};
 
@@ -1486,7 +1478,7 @@ sub sort_by_groups {
                      ($self->{'current_input'} eq '' ?
                        'default' : $self->{'current_input'}) .
                      ' workspace. ' .
-                     'The following directories are involved: ' .
+                     'The following directories or projects are involved: ' .
                      join(' and ', @dirs));
       return;
     }
@@ -1561,7 +1553,8 @@ sub sort_by_groups {
 sub sort_dependencies {
   my($self)     = shift;
   my($projects) = shift;
-  my(@list)     = sort @$projects;
+  my(@list)     = sort { return $self->sort_projects_by_directory($a, $b) + 0;
+                       } @$projects;
 
   ## Put the projects in the order specified
   ## by the project dpendencies.  We only need to do
@@ -1580,7 +1573,7 @@ sub sort_dependencies {
         $previous = [$li, $dir];
       }
     }
-     push(@grindex, [$previous->[0], $#list]);
+    push(@grindex, [$previous->[0], $#list]);
 
     ## Next, sort the individual groups
     foreach my $gr (@grindex) {
@@ -1952,6 +1945,23 @@ sub source_listing_callback {
                                                     $cwd, \@files ];
 }
 
+
+sub sort_projects_by_directory {
+  my($self)  = shift;
+  my($left)  = shift;
+  my($right) = shift;
+  my($sa)    = ($left =~ /\//);
+  my($sb)    = ($right =~ /\//);
+
+  if ($sa && !$sb) {
+    return 1;
+  }
+  elsif ($sb && !$sa) {
+    return -1;
+  }
+  return $left cmp $right;
+}
+
 # ************************************************************
 # Virtual Methods To Be Overridden
 # ************************************************************