Merge branch 'ternaryproperties' of git://github.com/pepsiman/buildbo…

…t into buildbot-0.8.7
buildbot · Sep 3, 2012 · 6d951eb · 6d951eb
2 parents 24e5e45 + 7dd1dbc
commit 6d951eb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/master/buildbot/process/properties.py b/master/buildbot/process/properties.py
@@ -197,9 +197,9 @@ class _PropertyMap(object):
     Privately-used mapping object to implement WithProperties' substitutions,
     including the rendering of None as ''.
     """
-    colon_minus_re = re.compile(r"(.*):-(.*)")
-    colon_tilde_re = re.compile(r"(.*):~(.*)")
-    colon_plus_re = re.compile(r"(.*):\+(.*)")
+    colon_minus_re = re.compile(r"([^:]*):-([^:]*)")
+    colon_tilde_re = re.compile(r"([^:]*):~([^:]*)")
+    colon_plus_re = re.compile(r"([^:]*):\+([^:]*)")
 
     colon_ternary_re = re.compile(r"""(?P<prop>.*) # the property to match
                                       :            # colon

diff --git a/master/buildbot/test/unit/test_process_properties.py b/master/buildbot/test/unit/test_process_properties.py
@@ -249,6 +249,15 @@ def testColonTernaryHashEmpty(self):
     def testColonTernaryHashUnset(self):
         return self.doTestSimpleWithProperties('%(prop_nosuch:#?.truish.falsish)s', 'falsish')
 
+    def testColonTernaryHashSetMinus(self):
+        return self.doTestSimpleWithProperties('%(prop_str:#?:-truish:falsish)s', '-truish')
+
+    def testColonTernaryHashSetTilde(self):
+        return self.doTestSimpleWithProperties('%(prop_str:#?:~truish:falsish)s', '~truish')
+
+    def testColonTernaryHashSetPlus(self):
+        return self.doTestSimpleWithProperties('%(prop_str:#?:+truish:falsish)s', '+truish')
+
 
     def testClearTempValues(self):
         d = self.doTestSimpleWithProperties('', '',