From: Timo Savola <tsavola@movial.fi>
Date: Fri, 4 Apr 2008 14:50:31 +0000 (+0300)
Subject: more consistent build and pull messages
X-Git-Tag: v1.0~158
X-Git-Url: https://sandbox.movial.com/gitweb/?p=matrix.git;a=commitdiff_plain;h=4da0b4c2f783552b368f22081b520c887056c86c;ds=inline

more consistent build and pull messages
---

diff --git a/matrix/matrix.py b/matrix/matrix.py
index 36ce2c8..0f39691 100644
--- a/matrix/matrix.py
+++ b/matrix/matrix.py
@@ -393,10 +393,11 @@ def build_components(targets, build_jobs=1, make_jobs=1):
 				found = True
 
 				if not component_cached(c):
-					print 'Starting to build', c.name
+					print 'Building', c.name
 					start_job(c, jobs, make_jobs)
-				else:
-					print c.name, 'found from cache'
+				elif config.debug:
+					print 'Component', c.name, \
+					      'found from cache'
 					c.active_state = 'built'
 
 		if not found and not jobs:
@@ -410,13 +411,14 @@ def build_components(targets, build_jobs=1, make_jobs=1):
 def component_buildable(c):
 	if c.active_state:
 		if config.debug:
-			print c.name, 'is in state:', c.active_state
+			print 'Component', c.name, 'is in state:', c.active_state
 		return False
 
 	for dep in c.active_depends:
 		if config.components[dep.name].active_state != 'built':
 			if config.debug:
-				print c.name, 'depends on unbuilt', dep.name
+				print 'Component', c.name, \
+				      'depends on unbuilt', dep.name
 			return False
 
 	return True
@@ -581,11 +583,13 @@ def pull_components(targets):
 		targets = config.components.keys()
 
 	for name in targets:
-		print 'Pulling component:', name
-
 		c = config.components[name]
-		git.pull(c.repo.path)
-		git.pull(c.meta.path)
+		pull_repository(c.repo)
+		pull_repository(c.meta)
+
+def pull_repository(repo):
+	print 'Pulling', repo.path
+	git.pull(repo.path)
 
 def source_dist_components(targets):
 	if not targets: