Merge branch 'master' of git://github.com/tomprince/buildbot

* 'master' of git://github.com/tomprince/buildbot:
  Support WithProperties in branch option of various source steps.
  Display admin on webstatus even if slave is disconnected.

Fixes #1893.

master/buildbot/status/web/slaves.py

@@ -136,8 +136,7 @@ def content(self, request, ctx):
             info['connected'] = slave.isConnected()
             info['connectCount'] = slave.getConnectCount()
 
-            if slave.isConnected():
-                info['admin'] = unicode(slave.getAdmin() or '', 'utf-8')
+            info['admin'] = unicode(slave.getAdmin() or '', 'utf-8')
             last = slave.lastMessageReceived()
             if last:
                 info['last_heard_from_age'] = abbreviate_age(time.time() - last)

master/buildbot/status/web/templates/buildslaves.html

@@ -39,17 +39,11 @@ <h1>Buildslaves</h1>
 
   <td>{{ (s.version or '-')|e }}</td>
 
-  {% if s.connected %}
-    <td>
-    {%- if s.admin -%}
-      {{ s.admin|email }}
-    {%- endif -%}
-    </td>
-
-
-  {% else %}
+  {%- if s.admin -%}
+    <td>{{ s.admin|email }}</td>
+  {%- else -%}
     <td>-</td>
-  {% endif %}
+  {%- endif -%}
 
     <td>
     {%- if s.last_heard_from_age -%}

master/buildbot/steps/source.py

@@ -227,7 +227,7 @@ def start(self):
         # what source stamp would this build like to use?
         s = self.build.getSourceStamp()
         # if branch is None, then use the Step's "default" branch
-        branch = s.branch or self.branch
+        branch = s.branch or properties.render(self.branch)
         # if revision is None, use the latest sources (-rHEAD)
         revision = s.revision
         if not revision and not self.alwaysUseLatest: