summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Burrows <dburrows@debian.org>2010-04-26 21:59:50 -0700
committerDaniel Burrows <dburrows@debian.org>2010-04-26 21:59:50 -0700
commit50c087c2474f12c23a72b25f3ef8c31a3bcde1e4 (patch)
tree5d67be7f1489540b20c19026e932264491247bfe
parent4e35a1ca5ae06e28a0f17cfa3d6deb746ca2a77a (diff)
downloadaptitude-50c087c2474f12c23a72b25f3ef8c31a3bcde1e4.tar.gz
Flatten the list of aptitude sources before making a set from it, since only the leaf nodes should be stored.
Otherwise we try to put lists into a set, which is just wrong.
-rw-r--r--SConstruct2
1 files changed, 1 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct
index 5061556e..928278c2 100644
--- a/SConstruct
+++ b/SConstruct
@@ -94,7 +94,7 @@ for variant_env in envs.programs.AllVariantEnvs():
variant_dir = 'build/%s/src' % variant_env.GetVariantName()
aptitude, all_aptitude_srcs_v = SConscript(['src/SConscript'],
variant_dir = variant_dir)
- all_aptitude_srcs_v = set(all_aptitude_srcs_v)
+ all_aptitude_srcs_v = set(Flatten(all_aptitude_srcs_v))
if all_aptitude_srcs is None:
all_aptitude_srcs = all_aptitude_srcs_v
elif all_aptitude_srcs_v != all_aptitude_srcs: