[Lsb-messages] /var/www/bzr/lsb/devel/buildbot-config r242: Don't include 'normal' in result_type setting.

Jeff Licquia licquia at linuxfoundation.org
Tue May 1 16:04:26 UTC 2012


------------------------------------------------------------
revno: 242
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: buildbot-config
timestamp: Tue 2012-05-01 12:04:26 -0400
message:
  Don't include 'normal' in result_type setting.
modified:
  lfbuildbot.py
-------------- next part --------------
=== modified file 'lfbuildbot.py'
--- a/lfbuildbot.py	2012-03-23 15:19:29 +0000
+++ b/lfbuildbot.py	2012-05-01 16:04:26 +0000
@@ -252,9 +252,8 @@
         # Set result type, for the upload tarball name.
 
         result_type = calc_branch_name
-        if build_type:
-            if build_type == "normal" or \
-               (result_type == "devel" and build_type != "devel") or \
+        if build_type and build_type != "normal":
+            if (result_type == "devel" and build_type != "devel") or \
                (result_type != "devel" and build_type != "production"):
                 result_type = result_type + "-" + build_type
         self.setProperty("result_type", result_type)



More information about the lsb-messages mailing list