Commit 78aacb3f authored by Jonathon Duerig's avatar Jonathon Duerig
Browse files

Fix subnode bug.

This only affects cases where -a and -p are both being used and there is a node of a type not allowed in the specified project with subnodes.
parent e56c8e96
......@@ -1375,16 +1375,17 @@ foreach $node (@nodenames) {
# Handle subnodes
# XXX This breaks if subnodes can themselves have subnodes
if ($current->is_subnode()) {
# We don't want to include subnodes unless their parent node is going
# to be in the ptop file too
if (!$nodes{$current->subnode_of()} ||
if (! exists($nodes{$current->subnode_of()}) ||
$sharing_mode{$current->subnode_of()} ||
!$nodetoavailable{$current->subnode_of()}) {
# In fact, nuke it from %nodes so that we don't include its links,
# either
$nodetoavailable{$node} = 0;
if (! $allnodes) {
if (! $allnodes || ! exists($nodes{$current->subnode_of()})) {
delete $nodes{$node};
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment