Guest User

Untitled

a guest
Oct 10th, 2014
174
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff --git a/morphlib/artifactresolver.py b/morphlib/artifactresolver.py
  2. index 8c8b37d..168c122 100644
  3. --- a/morphlib/artifactresolver.py
  4. +++ b/morphlib/artifactresolver.py
  5. @@ -82,7 +82,7 @@ class ArtifactResolver(object):
  6. self._added_artifacts.add(system)
  7.  
  8. resolved_artifacts = self._resolve_system_dependencies(
  9. - systems, source, queue)
  10. + systems, source)
  11.  
  12. for artifact in resolved_artifacts:
  13. if not artifact in self._added_artifacts:
  14. @@ -105,7 +105,7 @@ class ArtifactResolver(object):
  15. self._added_artifacts.add(stratum)
  16.  
  17. resolved_artifacts = self._resolve_stratum_dependencies(
  18. - strata, source, queue)
  19. + strata, source)
  20.  
  21. for artifact in resolved_artifacts:
  22. if not artifact in self._added_artifacts:
  23. @@ -126,15 +126,9 @@ class ArtifactResolver(object):
  24. return artifacts
  25.  
  26. def _create_initial_queue(self):
  27. - if all([x.morphology['kind'] == 'chunk' for x in self._source_pool]):
  28. - return collections.deque(self._source_pool)
  29. - else:
  30. - sources = [x for x in self._source_pool
  31. - if x.morphology['kind'] != 'chunk']
  32. - return collections.deque(sources)
  33. -
  34. - def _resolve_system_dependencies(self, systems,
  35. - source, queue): # pragma: no cover
  36. + return collections.deque(self._source_pool)
  37. +
  38. + def _resolve_system_dependencies(self, systems, source): # pragma: no cover
  39. artifacts = []
  40.  
  41. for info in source.morphology['strata']:
  42. @@ -156,11 +150,9 @@ class ArtifactResolver(object):
  43. source.add_dependency(stratum_artifact)
  44. artifacts.append(stratum_artifact)
  45.  
  46. - queue.append(stratum_source)
  47. -
  48. return artifacts
  49.  
  50. - def _resolve_stratum_dependencies(self, strata, source, queue):
  51. + def _resolve_stratum_dependencies(self, strata, source):
  52. artifacts = []
  53.  
  54. stratum_build_depends = []
  55. @@ -191,8 +183,6 @@ class ArtifactResolver(object):
  56.  
  57. source.add_dependency(other_stratum)
  58.  
  59. - queue.append(other_source)
  60. -
  61. # 'name' here is the chunk artifact name
  62. name_to_processed_artifacts = {}
RAW Paste Data