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

buildbot · Aug 17, 2013 · 5c7625d · 5c7625d
2 parents 0ebd205 + de730a9
commit 5c7625d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/master/buildbot/buildslave/base.py b/master/buildbot/buildslave/base.py
@@ -864,7 +864,7 @@ def _substantiate(self, build):
         def start_instance_result(result):
             # If we don't report success, then preparation failed.
             if not result:
-                log.msg("Slave '%s' doesn not want to substantiate at this time" % (self.slavename,))
+                log.msg("Slave '%s' does not want to substantiate at this time" % (self.slavename,))
                 d = self.substantiation_deferred
                 self.substantiation_deferred = None
                 d.callback(False)

diff --git a/master/buildbot/changes/svnpoller.py b/master/buildbot/changes/svnpoller.py
@@ -198,7 +198,7 @@ def determine_prefix(output):
             try:
                 doc = xml.dom.minidom.parseString(output)
             except xml.parsers.expat.ExpatError:
-                log.msg("SVNPoller: SVNPoller._determine_prefix_2: ExpatError in '%s'"
+                log.msg("SVNPoller: SVNPoller.get_prefix: ExpatError in '%s'"
                         % output)
                 raise
             rootnodes = doc.getElementsByTagName("root")
@@ -337,7 +337,7 @@ def create_changes(self, new_logentries):
                 kind = p.getAttribute("kind")
                 action = p.getAttribute("action")
                 path = "".join([t.data for t in p.childNodes])
-                # the rest of buildbot is certaily not yet ready to handle
+                # the rest of buildbot is certainly not yet ready to handle
                 # unicode filenames, because they get put in RemoteCommands
                 # which get sent via PB to the buildslave, and PB doesn't
                 # handle unicode.

diff --git a/master/buildbot/clients/tryclient.py b/master/buildbot/clients/tryclient.py
@@ -861,7 +861,7 @@ def getAvailableBuilderNames(self):
             d.addCallback(self._getBuilderNames, self._getBuilderNames2)
             return d
         if self.connect == "ssh":
-            print "Cannot get availble builders over ssh."
+            print "Cannot get available builders over ssh."
             sys.exit(1)
         raise RuntimeError(
             "unknown connecttype '%s', should be 'pb'" % self.connect)

diff --git a/master/buildbot/process/buildstep.py b/master/buildbot/process/buildstep.py
@@ -509,7 +509,7 @@ def setDefaultWorkdir(self, workdir):
         pass
 
     def addFactoryArguments(self, **kwargs):
-        # this is here for backwards compatability
+        # this is here for backwards compatibility
         pass
 
     def _getStepFactory(self):

diff --git a/master/buildbot/process/properties.py b/master/buildbot/process/properties.py
@@ -354,7 +354,7 @@ def getRenderingFor(self, build):
 
 
 def _getInterpolationList(fmtstring):
-    # TODO: Verify that no positial substitutions are requested
+    # TODO: Verify that no positional substitutions are requested
     dd = collections.defaultdict(str)
     fmtstring % dd
     return dd.keys()
@@ -642,7 +642,7 @@ def renderer(fn):
 
 class _DefaultRenderer(object):
     """
-    Default IRenderable adaptor. Calls .getRenderingFor if availble, otherwise
+    Default IRenderable adaptor. Calls .getRenderingFor if available, otherwise
     returns argument unchanged.
     """