summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-11-18 16:58:45 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-11-18 16:58:45 +0000
commita2c496c14ef31c64a8f40083a6aee929ca0ff521 (patch)
treee2b39fe19343f073d7af6534e720ab83dfdc5b4b
parent96f57cd13d8c4278d206f15949bf9bdb786b9f8f (diff)
downloadimport-a2c496c14ef31c64a8f40083a6aee929ca0ff521.tar.gz
Fix stratum generation to work for all kinds of dependencies
Previously it was hardcoded to just look for rubygems deps, which has an obvious flaw. It now looks for all types of dependencies that were enabled with enable_importer().
-rw-r--r--baserockimport/mainloop.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/baserockimport/mainloop.py b/baserockimport/mainloop.py
index ccb695d..5574796 100644
--- a/baserockimport/mainloop.py
+++ b/baserockimport/mainloop.py
@@ -545,9 +545,16 @@ class ImportLoop(object):
dep_package = find(graph, lambda p: p.match(name, version))
return '%s-%s' % (name, dep_package.version_in_use)
+ def get_build_deps(morphology):
+ deps = dict()
+ for kind in self.importers:
+ field = 'x-build-dependencies-%s' % kind
+ deps.update(morphology.get(field, []))
+ return deps
+
build_depends = [
format_build_dep(name, version) for name, version in
- m['x-build-dependencies-rubygems'].iteritems()
+ get_build_deps(m).iteritems()
]
entry = {