diff options
| author | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2014-11-14 16:03:57 +0000 |
|---|---|---|
| committer | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2014-11-21 10:44:47 +0000 |
| commit | 1365efb0bed89a7d7d019b9823fe96bd09d8e962 (patch) | |
| tree | 14b23453a24edf594a9a5d3fbfa9a5db7ef345ef | |
| parent | d9d72928a744fe1f54e42f8607a5466ca415a79f (diff) | |
| download | import-1365efb0bed89a7d7d019b9823fe96bd09d8e962.tar.gz | |
Get build-depends from the right place
We don't keep build-dependency information in the morphology anymore
| -rw-r--r-- | baserockimport/mainloop.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/baserockimport/mainloop.py b/baserockimport/mainloop.py index 5cb0323..580a890 100644 --- a/baserockimport/mainloop.py +++ b/baserockimport/mainloop.py @@ -215,7 +215,7 @@ class ImportLoop(object): 'See the README files for guidance.') else: self._generate_stratum_morph_if_none_exists( - processed, self.goal_name) + processed, self.goal_kind, self.goal_name) duration = time.time() - start_time end_displaytime = time.strftime('%x %X %Z', time.localtime()) @@ -549,7 +549,7 @@ class ImportLoop(object): 'One or more cycles detected in build graph: %s' % (', '.join(all_loops_str))) - def _generate_stratum_morph_if_none_exists(self, graph, goal_name): + def _generate_stratum_morph_if_none_exists(self, graph, kind, goal_name): filename = os.path.join( self.app.settings['definitions-dir'], 'strata', '%s.morph' % goal_name) @@ -576,7 +576,7 @@ class ImportLoop(object): build_depends = [ format_build_dep(name, version) for name, version in - m['x-build-dependencies-rubygems'].iteritems() + package.dependencies[kind]['build-dependencies'].iteritems() ] entry = { @@ -585,7 +585,7 @@ class ImportLoop(object): 'ref': m.ref, 'unpetrify-ref': m.named_ref, 'morph': m.filename, - 'build-depends': build_depends, + 'build-depends': build_depends } chunk_entries.append(entry) |