0.8.4 Branch fixups for properties

Do not render properties in MailNotifier extraHeaders (Refs #2021)

Make the WithProperties callable example work (Refs #2024)

master/buildbot/process/build.py

@@ -106,6 +106,10 @@ def getProperties(self):
     def getProperty(self, propname):
         return self.build_status.getProperty(propname)
 
+    def hasProperty(self, propname):
+        return self.build_status.properties.has_key(propname)
+    has_key = hasProperty
+
     def render(self, value):
         """
         Return a variant of value that has any WithProperties objects

master/buildbot/status/mail.py

@@ -541,18 +541,12 @@ def createEmail(self, msgdict, builderName, title, results, builds=None,
         # interpolation if only one build was given
         if self.extraHeaders:
             for k,v in self.extraHeaders.items():
-                if len(builds) == 1:
-                    k = builds[0].render(k)
                 if k in m:
                     twlog.msg("Warning: Got header " + k +
                       " in self.extraHeaders "
                       "but it already exists in the Message - "
                       "not adding it.")
-                continue
-                if len(builds == 1):
-                    m[k] = builds[0].render(v)
-                else:
-                    m[k] = v
+                m[k] = v
 
         return m
 

master/buildbot/test/unit/test_process_builder.py

@@ -19,7 +19,7 @@
 from twisted.python import failure
 from twisted.internet import defer
 from buildbot.test.fake import fakedb, fakemaster
-from buildbot.process import builder, buildrequest
+from buildbot.process import builder
 from buildbot.db import buildrequests
 from buildbot.util import epoch2datetime
 

master/docs/cfg-buildsteps.texinfo

@@ -226,9 +226,9 @@ WithProperties('%(now)s', now=lambda _: time.clock())
 
 @example
 def determine_foo(props):
-    if props.has_key('bar'):
+    if props.hasProperty('bar'):
         return props['bar']
-    elif props.has_key('baz'):
+    elif props.hasProperty('baz'):
         return props['baz']
     return 'qux'
 

master/docs/cfg-statustargets.texinfo

@@ -997,8 +997,7 @@ text of the message. The @code{type} key is the message type ('plain' or
 
 @item extraHeaders
 (dictionary) A dictionary containing key/value pairs of extra headers to add
-to sent e-mails. If buildSetStatus is False, both the keys and the values may be
-a WithProperties instance.
+to sent e-mails.  Property interpolation is not supported in this version.
 
 @end table