Fix build ordering

1 files changed, 24 insertions, 6 deletions

diff --git a/simplejenkinsapi/order.py b/simplejenkinsapi/order.py
index 9973977..02fdf14 100644
--- a/simplejenkinsapi/order.py
+++ b/simplejenkinsapi/order.py
@@ -16,25 +16,43 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+def _traverse(project, result):
+    for dep in project['_']:
+        _traverse(dep, result)
+    if project not in result:
+        result.append(project)
+    return result
+    
+
+def _roots(projects):
+    '''Return list of projects that are not build dependencies of anyone.'''
+    
+    roots = projects[:]
+    for project in projects:
+        roots = [r for r in roots if r not in project['_']]
+    return roots
+
+
 def order(projects):
     by_name = {}
     for project in projects:
         by_name[project['name']] = project
 
     for project in projects:
-        project['_'] = [by_name[dep['name']] 
-                        for dep in project.get('build-depends, [])]
+        project['_'] = [by_name[dep]
+                        for dep in project.get('build-depends', [])]
+
+    roots = _roots(projects)
 
     linear = []
-    for project in projects:
-        linear.extend(project['_'])
-        linear.append(project)
+    for project in roots:
+        _traverse(project, linear)
 
     result = []
     while linear:
         project = linear.pop(0)
         if project not in linear:
             result.append(project)
-            
+
     return result