summaryrefslogtreecommitdiff
path: root/reconfigure/includers/auto.py
diff options
context:
space:
mode:
Diffstat (limited to 'reconfigure/includers/auto.py')
-rw-r--r--reconfigure/includers/auto.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/reconfigure/includers/auto.py b/reconfigure/includers/auto.py
index 16844ca..c220d88 100644
--- a/reconfigure/includers/auto.py
+++ b/reconfigure/includers/auto.py
@@ -1,4 +1,4 @@
-from base import BaseIncluder
+from reconfigure.includers.base import BaseIncluder
from reconfigure.nodes import *
import glob
import os
@@ -50,7 +50,9 @@ class AutoIncluder (BaseIncluder):
if replacement:
node.children[node.children.index(child)] = replacement
else:
- if child.origin != node.origin:
+ if child.origin is None:
+ child.origin = node.origin
+ elif child.origin != node.origin:
node.children.remove(child)
result.setdefault(child.origin, RootNode()).children.append(self.decompose_rec(child, result))
else: