summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--morphlib/buildbranch.py5
-rw-r--r--morphlib/plugins/build_plugin.py5
2 files changed, 6 insertions, 4 deletions
diff --git a/morphlib/buildbranch.py b/morphlib/buildbranch.py
index afcd832d..2a2530b0 100644
--- a/morphlib/buildbranch.py
+++ b/morphlib/buildbranch.py
@@ -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())
diff --git a/morphlib/plugins/build_plugin.py b/morphlib/plugins/build_plugin.py
index 2cc395fc..a5502180 100644
--- a/morphlib/plugins/build_plugin.py
+++ b/morphlib/plugins/build_plugin.py
@@ -199,9 +199,12 @@ class BuildPlugin(cliapp.Plugin):
email = morphlib.git.get_user_email(self.app.runcmd)
build_ref_prefix = self.app.settings['build-ref-prefix']
- self.app.status(msg='Starting build %(uuid)s', uuid=build_uuid)
+ self.app.status(msg='Looking for uncommitted changes (pass '
+ '--local-changes=ignore to skip)')
+
self.app.status(msg='Collecting morphologies involved in '
'building %(system)s from %(branch)s',
+ chatty=True,
system=system_filename,
branch=sb.system_branch_name)