diff options
| author | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2015-04-15 12:17:16 +0000 |
|---|---|---|
| committer | Morph (on behalf of Adam Coldrick) <adam.coldrick@codethink.co.uk> | 2015-04-15 12:17:16 +0000 |
| commit | 85995d210162d1432800acf357f8162b77f5b47e (patch) | |
| tree | 256ba048782865a8d9b52e497ff0ea5f694d652b /morphlib/buildbranch.py | |
| parent | 3167ced4844c9602e88289607d1c2cc2ecbd5d95 (diff) | |
| download | morph-baserock/6453f312359f4317803ef7f14b58d21f/d675b946df4f456693ed211dcd2ec95e.tar.gz | |
Morph build c3874f415dc6448ca28d9a01edab0948baserock/6453f312359f4317803ef7f14b58d21f/d675b946df4f456693ed211dcd2ec95e
System branch: master
Diffstat (limited to 'morphlib/buildbranch.py')
| -rw-r--r-- | morphlib/buildbranch.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/morphlib/buildbranch.py b/morphlib/buildbranch.py index 80cecd75..2a2530b0 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 @@ -303,9 +303,8 @@ def pushed_build_branch(bb, loader, changes_need_pushing, name, email, build_uuid, status): with contextlib.closing(bb) as bb: def report_add(gd, build_ref, changed): - status(msg='Adding uncommitted changes '\ - 'in %(dirname)s to %(ref)s', - dirname=gd.dirname, ref=build_ref, chatty=True) + status(msg='Creating temporary branch in %(dirname)s '\ + 'named %(ref)s', dirname=gd.dirname, ref=build_ref) changes_made = bb.add_uncommitted_changes(add_cb=report_add) unpushed = any(bb.get_unpushed_branches()) |