summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-12-03 14:42:23 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-12-04 15:47:00 +0000
commite7110f6551d25ac290f48abaa3a58262a98ba6e3 (patch)
tree9b9e8a42ad46e734d0d02ef9c70512f3197cc528
parent39f708721adee1539e503f6cb2035f70288367e9 (diff)
downloadmorph-e7110f6551d25ac290f48abaa3a58262a98ba6e3.tar.gz
Fix finding Git directories to include in a temporary build ref
When running 'morph build' the code looks through all the Git repos in a system branch, to see which are involved in the build. These are then checked for local changes and have temporary build refs created in them. Due to a mistake in the logic, this would give up if it found a repo that came from elsewhere but was inside the system branch directory. So in the past some legitimate repos might have been ignored sometimes.
-rw-r--r--morphlib/buildbranch.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/morphlib/buildbranch.py b/morphlib/buildbranch.py
index 2d529133..09f6e104 100644
--- a/morphlib/buildbranch.py
+++ b/morphlib/buildbranch.py
@@ -66,7 +66,7 @@ class BuildBranch(object):
repo_uuid = gd.get_config('morph.uuid')
except cliapp.AppException:
# Not a repository cloned by morph, ignore
- break
+ continue
build_ref = os.path.join('refs/heads', build_ref_prefix,
branch_uuid, repo_uuid)
# index is commit of workspace + uncommitted changes may want