commit 371ed667c8588543559f04ab11cc13953a6bb25f
author Jan Hruban <jan.hruban@gooddata.com> Thu Dec 17 16:32:30 2015 +0100
committer Jan Hruban <jan.hruban@gooddata.com> Thu Dec 17 22:33:56 2015 +0100
tree 7d699042ddacf59c64b4a9c250ec809cae9891ce
parent 257cc7e1f9dbf4884debdb0884a61074bb8860a0

Clarify zuul-cloner message about missing branch

Inform correctly about the missing branch in case that ZUUL_BRANCH is
set, but options --branch is empty.

Before:
INFO:zuul.Cloner:upstream repo is missing branch None
After:
INFO:zuul.Cloner:upstream repo is missing branch stable

Also do not print out anything when ZUUL_BRANCH nor --branch is given.

Change-Id: I74b3e72b3066f03bcf3a10af3657bdf494d3cc6b

zuul/lib/cloner.py

diff --git a/zuul/lib/cloner.py b/zuul/lib/cloner.py
index 0ac7f0f..1ba31b7 100644
--- a/zuul/lib/cloner.py
+++ b/zuul/lib/cloner.py
@@ -148,8 +148,9 @@
             self.log.info("upstream repo has branch %s", indicated_branch)
             fallback_branch = indicated_branch
         else:
-            self.log.info("upstream repo is missing branch %s",
-                          self.branch)
+            if indicated_branch:
+                self.log.info("upstream repo is missing branch %s",
+                              indicated_branch)
             # FIXME should be origin HEAD branch which might not be 'master'
             fallback_branch = 'master'