Merge branch 'renderables_dup' of git://github.com/Ratio2/buildbot

+autopep8
buildbot · Nov 20, 2013 · cad2c77 · cad2c77
2 parents 219f00c + 6ef3aef
commit cad2c77
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/master/buildbot/steps/shell.py b/master/buildbot/steps/shell.py
@@ -76,7 +76,7 @@ class ShellCommand(buildstep.LoggingBuildStep):
     """
 
     name = "shell"
-    renderables = buildstep.LoggingBuildStep.renderables + [
+    renderables = [
         'slaveEnvironment', 'remote_kwargs', 'command',
         'description', 'descriptionDone', 'descriptionSuffix',
         'haltOnFailure', 'flunkOnFailure']

diff --git a/master/buildbot/steps/source/base.py b/master/buildbot/steps/source/base.py
@@ -35,9 +35,8 @@ class Source(LoggingBuildStep, CompositeStepMixin):
     starts a RemoteCommand with those arguments.
     """
 
-    renderables = LoggingBuildStep.renderables + [
-        'description', 'descriptionDone', 'descriptionSuffix',
-        'workdir']
+    renderables = ['description', 'descriptionDone', 'descriptionSuffix',
+                   'workdir']
 
     description = None  # set this to a list of short strings to override
     descriptionDone = None  # alternate description when the step is complete