[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r606: Work around an incompatibility in buildbot's dependencies.

[Jeff Licquia]

------------------------------------------------------------
revno: 606
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Thu 2014-07-24 10:48:33 -0400
message:
  Work around an incompatibility in buildbot's dependencies.
modified:
  modules/buildbot/manifests/master.pp
-------------- next part --------------
=== modified file 'modules/buildbot/manifests/master.pp'
--- a/modules/buildbot/manifests/master.pp	2014-05-22 19:33:19 +0000
+++ b/modules/buildbot/manifests/master.pp	2014-07-24 14:48:33 +0000
@@ -4,6 +4,8 @@
 
     include buildbotpw
 
+    $sqlalchemyversion = '0.7.10'
+
     $buildbotconfigrev = 'revid:licquia at linuxfoundation.org-20140509154043-ovatueczfovn3mft'
 
     $weeklyrebuildarchs = 'x86,x86_64,ia64,ppc32,ppc64,s390,s390x'
@@ -17,13 +19,23 @@
         ensure => present,
     }
 
+    exec { "make-sqlalchemy":
+        command => "/opt/buildbot/bin/pip install sqlalchemy==${sqlalchemyversion}",
+        cwd     => "/opt/buildbot",
+        creates => "/opt/buildbot/lib/python${pythonversion}/site-packages/SQLAlchemy-${sqlalchemyversion}-py${pythonversion}.egg-info"
+        path    => [ "/opt/buildbot/bin", "/bin", "/sbin", "/usr/bin",
+                     "/usr/sbin" ],
+        require => Exec["make-buildbot-virtualenv"],
+    }
+
     exec { "make-buildbot":
         command => "/opt/buildbot/bin/pip install buildbot==$buildbotversion",
         cwd     => "/opt/buildbot",
         creates => "/opt/buildbot/lib/python${pythonversion}/site-packages/buildbot-${buildbotversion}-py${pythonversion}.egg-info",
         path    => [ "/opt/buildbot/bin", "/bin", "/sbin", "/usr/bin",
                      "/usr/sbin" ],
-        require => Exec["make-buildbot-virtualenv"],
+        require => [ Exec["make-buildbot-virtualenv"],
+                     Exec["make-sqlalchemy"] ],
     }
 
     exec { "make-buildbot-config":