summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2015-03-31 09:35:16 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2015-03-31 10:57:04 +0000
commit2b580853160569ce1d97e88fa32929b29c03db6a (patch)
tree160f3fe500cbec54b3b6c2b44ce50b3b823fbbf7
parent4eefbb2500c7e0b3a4ccfcc7dc17d0e0a21c1dd2 (diff)
downloadmorph-2b580853160569ce1d97e88fa32929b29c03db6a.tar.gz
build: Print the correct name of the temporary build branch
Before: $ morph build systems/devel-system-x86_64-generic.morph --verbose 2015-03-31 09:35:36 new environment variable GIT_NO_REPLACE_OBJECTS = "1" 2015-03-31 09:35:36 Starting build 3fba9406f75242afbfdb413bf9658516 2015-03-31 09:35:36 Collecting morphologies involved in building systems/devel-system-x86_64-generic.morph from master 2015-03-31 09:25:08 Adding uncommitted changes in /src/ws/master/baserock/baserock/definitions to <morphlib.gitdir.GitDirectory object at 0x7f6137060cd0> After: $ morph build systems/devel-system-x86_64-generic.morph --verbose 2015-03-31 09:35:36 new environment variable GIT_NO_REPLACE_OBJECTS = "1" 2015-03-31 09:35:36 Starting build 3fba9406f75242afbfdb413bf9658516 2015-03-31 09:35:36 Collecting morphologies involved in building systems/devel-system-x86_64-generic.morph from master 2015-03-31 09:35:37 Adding uncommitted changes in /src/ws/master/baserock/baserock/definitions to refs/heads/baserock/builds/f0b21fe240b244edb7e4142b6e201658/8df11f234ab24d22a9616ce911542332 Change-Id: I5b61ae6f10b26458178ead551e7ec12c1926014e
-rw-r--r--morphlib/buildbranch.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/morphlib/buildbranch.py b/morphlib/buildbranch.py
index 80cecd75..afcd832d 100644
--- a/morphlib/buildbranch.py
+++ b/morphlib/buildbranch.py
@@ -103,7 +103,7 @@ class BuildBranch(object):
in index.get_uncommitted_changes()]
if not changed:
continue
- add_cb(gd=gd, build_ref=gd, changed=changed)
+ add_cb(gd=gd, build_ref=build_ref, changed=changed)
changes_made = True
index.add_files_from_working_tree(changed)
return changes_made