Merge sa2ajj/buildbot:fix-misc-latent-slave (PR #1190)

buildbot · Aug 3, 2014 · e6d1bdd · e6d1bdd
2 parents 6189bb8 + c42cd1b
commit e6d1bdd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/master/buildbot/buildslave/ec2.py b/master/buildbot/buildslave/ec2.py
@@ -25,14 +25,16 @@
 import re
 import time
 
-import boto
-import boto.ec2
-import boto.exception
+try:
+    import boto
+except ImportError:
+    boto = None
 
 from twisted.internet import defer
 from twisted.internet import threads
 from twisted.python import log
 
+from buildbot import config
 from buildbot import interfaces
 from buildbot.buildslave.base import AbstractLatentBuildSlave
 
@@ -62,6 +64,10 @@ def __init__(self, name, password, instance_type, ami=None,
                  placement=None, price_multiplier=1.2, tags={}, retry=1,
                  retry_price_adjustment=1, product_description='Linux/UNIX'):
 
+        if not boto:
+            config.error("The python module 'boto' is needed to use a "
+                         "EC2LatentBuildSlave")
+
         AbstractLatentBuildSlave.__init__(
             self, name, password, max_builds, notify_on_missing,
             missing_timeout, build_wait_timeout, properties, locks)

diff --git a/master/buildbot/ec2buildslave.py b/master/buildbot/ec2buildslave.py
@@ -20,7 +20,7 @@
 
 deprecatedModuleAttribute(Version("Buildbot", 0, 8, 8),
                           "It has been moved to buildbot.buildslave.ec2",
-                          "buildbot.libvirtbuildslave", "EC2LatentBuildSlave")
+                          "buildbot.ec2buildslave", "EC2LatentBuildSlave")
 
 _hush_pyflakes = [
     EC2LatentBuildSlave,

diff --git a/master/docs/manual/customization.rst b/master/docs/manual/customization.rst
@@ -368,7 +368,7 @@ Writing a new latent buildslave should only require subclassing :class:`buildbot
         # Callback value is ignored.
         raise NotImplementedError
 
-See :class:`buildbot.ec2buildslave.EC2LatentBuildSlave` for an example, or see the test example :class:`buildbot.test_slaves.FakeLatentBuildSlave`.
+See :class:`buildbot.buildslave.ec2.EC2LatentBuildSlave` for an example.
 
 Custom Build Classes
 --------------------