Merge branch 'typos' of git://github.com/vrutsky/buildbot

master/buildbot/buildslave.py

@@ -962,7 +962,7 @@ def _soft_disconnect(self, fast=False):
             # here, we just do what should be appropriate for the first case,
             # and put our heads in the sand for the second, at least for now.
             # The best solution to the odd situation is removing it as a
-            # possibilty: make the master in charge of connecting to the
+            # possibility: make the master in charge of connecting to the
             # slave, rather than vice versa. TODO.
             yield defer.DeferredList([
                 AbstractBuildSlave.disconnect(self),

master/buildbot/config.py

@@ -363,8 +363,8 @@ def load_caches(self, filename, config_dict):
             else:
                 valPairs = caches.items()
                 for (x, y) in valPairs:
-                  if (not isinstance(y, int)):
-                     error("value for cache size '%s' must be an integer" % x)
+                    if not isinstance(y, int):
+                        error("value for cache size '%s' must be an integer" % x)
                 self.caches.update(caches)
 
         if 'buildCacheSize' in config_dict:

master/buildbot/libvirtbuildslave.py

@@ -126,7 +126,7 @@ def __init__(self, uri):
 
     @defer.inlineCallbacks
     def lookupByName(self, name):
-        """ I lookup an existing prefined domain """
+        """ I lookup an existing predefined domain """
         res = yield queue.executeInThread(self.connection.lookupByName, name)
         defer.returnValue(self.DomainClass(self, res))
 
@@ -182,11 +182,11 @@ def _find_existing_instance(self):
 
         domains = yield self.connection.all()
         for d in domains:
-           name = yield d.name()
-           if name.startswith(self.name):
-               self.domain = d
-               self.substantiated = True
-               break
+            name = yield d.name()
+            if name.startswith(self.name):
+                self.domain = d
+                self.substantiated = True
+                break
 
         self.ready = True
 
@@ -243,8 +243,8 @@ def start_instance(self, build):
         in the list of defined virtual machines and start that.
         """
         if self.domain is not None:
-             log.msg("Cannot start_instance '%s' as already active" % self.name)
-             defer.returnValue(False)
+            log.msg("Cannot start_instance '%s' as already active" % self.name)
+            defer.returnValue(False)
 
         yield self._prepare_base_image()
 

master/contrib/windows/buildbot_service.py

@@ -345,7 +345,7 @@ def error(self, s):
         self._dolog(servicemanager.LogErrorMsg, s)
 
     # Functions that spawn a child process, redirecting any output.
-    # Although builtbot itself does this, it is very handy to debug issues
+    # Although buildbot itself does this, it is very handy to debug issues
     # such as ImportErrors that happen before buildbot has redirected.
 
     def createProcess(self, cmd):
@@ -520,24 +520,24 @@ def _WaitForShutdown(h):
     reactor.callLater(0, reactor.stop)
 
 def DetermineRunner(bbdir):
-   '''Checks if the given directory is a buildslave or a master and returns the
-   appropriate run function.'''
-   try:
-      import buildslave.scripts.runner
-      tacfile = os.path.join(bbdir, 'buildbot.tac')
-
-      if os.path.exists(tacfile):
-         with open(tacfile, 'r') as f:
-            contents = f.read()
-            if 'import BuildSlave' in contents:
-               return buildslave.scripts.runner.run
-
-   except ImportError:
-      # Use the default
-      pass
-
-   import buildbot.scripts.runner
-   return buildbot.scripts.runner.run
+    '''Checks if the given directory is a buildslave or a master and returns the
+    appropriate run function.'''
+    try:
+        import buildslave.scripts.runner
+        tacfile = os.path.join(bbdir, 'buildbot.tac')
+
+        if os.path.exists(tacfile):
+            with open(tacfile, 'r') as f:
+                contents = f.read()
+                if 'import BuildSlave' in contents:
+                    return buildslave.scripts.runner.run
+
+    except ImportError:
+        # Use the default
+        pass
+
+    import buildbot.scripts.runner
+    return buildbot.scripts.runner.run
 
 # This function is also called by the py2exe startup code.
 

slave/contrib/windows/buildbot_service.py

@@ -211,7 +211,7 @@ def SvcStop(self):
         # Set the stop event - the main loop takes care of termination.
         win32event.SetEvent(self.hWaitStop)
 
-    # SvcStop only gets triggered when the user explictly stops (or restarts)
+    # SvcStop only gets triggered when the user explicitly stops (or restarts)
     # the service.  To shut the service down cleanly when Windows is shutting
     # down, we also need to hook SvcShutdown.
     SvcShutdown = SvcStop
@@ -345,7 +345,7 @@ def error(self, s):
         self._dolog(servicemanager.LogErrorMsg, s)
 
     # Functions that spawn a child process, redirecting any output.
-    # Although builtbot itself does this, it is very handy to debug issues
+    # Although buildbot itself does this, it is very handy to debug issues
     # such as ImportErrors that happen before buildbot has redirected.
 
     def createProcess(self, cmd):