[Lsb-messages] /var/www/bzr/lsb/devel/buildbot-config r342: Fix bug in LF buildbot module for specifying build LSB version.

Jeff Licquia licquia at linuxfoundation.org
Sat Mar 1 20:31:40 UTC 2014


------------------------------------------------------------
revno: 342
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: buildbot-config
timestamp: Sat 2014-03-01 15:31:40 -0500
message:
  Fix bug in LF buildbot module for specifying build LSB version.
modified:
  lfbuildbot.py
-------------- next part --------------
=== modified file 'lfbuildbot.py'
--- a/lfbuildbot.py	2014-02-27 20:05:37 +0000
+++ b/lfbuildbot.py	2014-03-01 20:31:40 +0000
@@ -232,16 +232,16 @@
         args = []
 
         branch_name = self.getProperty("branch_name")
-        explicit_lsb_version = self.getProperty("lsb_version", None)
-        if explicit_lsb_version is None:
+        lsb_version = self.getProperty("lsb_version", None)
+        if lsb_version is None:
             found_lsb_version = re.match(r'^\d+\.\d+$', branch_name)
             if found_lsb_version:
-                args.append("LSBCC_LSBVERSION=%s" % branch_name)
-        else:
-            args.append("LSBCC_LSBVERSION=%s" % explicit_lsb_version)
+                lsb_version = branch_name
+        if lsb_version:
+            args.append("LSBCC_LSBVERSION=%s" % lsb_version)
 
         if self.getProperty("build_type") in ("beta", "production") \
-                or found_lsb_version:
+                or lsb_version:
             source_revision = self.getProperty("revision")
             if isinstance(source_revision, str) and \
                source_revision[:4] == "tag:":



More information about the lsb-messages mailing list