diff options
author | Javier Jardón <jjardon@gnome.org> | 2015-03-04 19:03:58 +0000 |
---|---|---|
committer | Javier Jardón <jjardon@gnome.org> | 2015-03-04 19:14:43 +0000 |
commit | 8cf5c70943817c5c24b1f8b79a67cc8ac1d7dab0 (patch) | |
tree | d32463a103a01bb63ff606f94fde422324443644 /morphlib/artifactresolver.py | |
parent | ecc2961699488cb409e45f1a3560c0181caf56d5 (diff) | |
download | morph-8cf5c70943817c5c24b1f8b79a67cc8ac1d7dab0.tar.gz |
Do not fail if a chunk doesnt have a 'build-depends' parameter definedjjardon/no_build_depends
Diffstat (limited to 'morphlib/artifactresolver.py')
-rw-r--r-- | morphlib/artifactresolver.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/morphlib/artifactresolver.py b/morphlib/artifactresolver.py index e53c7511..5062f854 100644 --- a/morphlib/artifactresolver.py +++ b/morphlib/artifactresolver.py @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2014 Codethink Limited +# Copyright (C) 2012-2015 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -195,13 +195,14 @@ class ArtifactResolver(object): chunk_source.add_dependency(other_stratum) # Add dependencies between chunks mentioned in this stratum - for name in build_depends: # pragma: no cover - if name not in name_to_processed_artifacts: - raise DependencyOrderError( - source, info['name'], name) - other_artifacts = name_to_processed_artifacts[name] - for other_artifact in other_artifacts: - chunk_source.add_dependency(other_artifact) + if build_depends is not None: + for name in build_depends: # pragma: no cover + if name not in name_to_processed_artifacts: + raise DependencyOrderError( + source, info['name'], name) + other_artifacts = name_to_processed_artifacts[name] + for other_artifact in other_artifacts: + chunk_source.add_dependency(other_artifact) # Add build dependencies between our stratum's artifacts # and the chunk artifacts produced by this stratum. |