Merge lp:~vorlon/xdeb/xdeb-graph-build-dep-deps into lp:~wookey/xdeb/xdeb-graph

Proposed by Steve Langasek
Status: Merged
Merged at revision: 257
Proposed branch: lp:~vorlon/xdeb/xdeb-graph-build-dep-deps
Merge into: lp:~wookey/xdeb/xdeb-graph
Diff against target: 13 lines (+2/-1)
1 file modified
xdeb.py (+2/-1)
To merge this branch: bzr merge lp:~vorlon/xdeb/xdeb-graph-build-dep-deps
Reviewer Review Type Date Requested Status
Wookey Pending
Review via email: mp+52921@code.launchpad.net

Description of the change

Here's a branch for the fix I mentioned earlier today: with --only-explicit
and the xdeb-graph branch, xdeb currently overlooks the dependencies of
libfoo1, where bar build-depends: libfoo-dev and libfoo-dev depends: libfoo1
and both libfoo-dev and libfoo1 are built from the same source package. So
we need a way to track our recursion on a binary package basis, not just a
source package basis.

I've reused the builddep_pkgs array for this purpose, but I haven't checked
what impact this has on the graphing functions. It's possible we need Yet
Another Array to track this state properly.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'xdeb.py'
2--- xdeb.py 2011-03-08 23:00:53 +0000
3+++ xdeb.py 2011-03-10 20:36:13 +0000
4@@ -314,7 +314,8 @@
5 src_name=get_src_name(options, real_dep)
6 if src_name is None:
7 continue
8- if src_name not in all_srcs:
9+ if real_dep not in builddep_pkgs:
10+ builddep_pkgs[real_dep] = True
11 if should_expand(options, src, real_dep):
12 expand_depends(options, graph_pkg, real_dep, depth + 1,
13 builddep_depth,

Subscribers

People subscribed via source and target branches

to all changes: