Merge lp:~vorlon/xdeb/xdeb-graph-harder into lp:~wookey/xdeb/xdeb-graph

[Steve Langasek]

A few fixes to the xdeb-graph branch

[lp:~vorlon/xdeb/xdeb-graph-harder]

259. By Steve Langasek on 2011-03-10

sync up with the xdeb-graph branch

[Wookey (wookey)]

This fix wasn't right. (or at least the 'not' wasn't. susumed into the xdeb-graph branch and then trunk so this branch now irrelevant.

review: Disapprove

Unmerged revisions

259. By Steve Langasek on 2011-03-10

sync up with the xdeb-graph branch

258. By Steve Langasek on 2011-03-10

break out of the or_deps loop any time we find an available alternative,
not just when we find one we haven't seen previously.

257. By Steve Langasek on 2011-03-10

correct an inversion overlooked when refactoring expand_depends

=== modified file 'xdeb.py'
--- xdeb.py	2011-03-10 23:02:42 +0000
+++ xdeb.py	2011-03-10 23:35:09 +0000
@@ -294,7 +294,7 @@
     # what is built can be installed. However we only want to do this 
     # for binary deps that are actually needed as build-deps
     for binary in get_src_binaries(options, src):
-        if binary in builddep_pkgs:
+        if binary not in builddep_pkgs:
             continue
         if not is_crossable(binary) or is_toolchain(binary):
             continue
@@ -323,7 +323,7 @@
                         expand_depends(options, graph_pkg, real_dep, depth + 1,
                                        builddep_depth,
                                        parent=src, parent_binary=binary)
-                    break
+                break
 
 def mark_needs_build(options, src, force=False):
     """Decide whether a package needs to be (re)built."""