summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbst-marge-bot <marge-bot@buildstream.build>2019-03-01 12:20:28 +0000
committerbst-marge-bot <marge-bot@buildstream.build>2019-03-01 12:20:28 +0000
commit7a407926fce8a289e2fc1cbecba92bb7a83d5970 (patch)
tree1892f7d8dcdf15a9fe07b9f522e6a3c688984f38
parent57a314d8793b64859598c2217208e2d1d83af5b5 (diff)
parent30fedb3aa607c3cefa6505a95c5a1fcf5d616d69 (diff)
downloadbuildstream-7a407926fce8a289e2fc1cbecba92bb7a83d5970.tar.gz
Merge branch 'aevri/unused_commandname' into 'master'
buildelement: rm unused 'cmd_name' argument See merge request BuildStream/buildstream!1197
-rw-r--r--buildstream/buildelement.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/buildstream/buildelement.py b/buildstream/buildelement.py
index 6ef060f12..eb30d9d31 100644
--- a/buildstream/buildelement.py
+++ b/buildstream/buildelement.py
@@ -239,7 +239,7 @@ class BuildElement(Element):
with sandbox.batch(SandboxFlags.ROOT_READ_ONLY, label="Running {}".format(command_name)):
for cmd in commands:
- self.__run_command(sandbox, cmd, command_name)
+ self.__run_command(sandbox, cmd)
# %{install-root}/%{build-root} should normally not be written
# to - if an element later attempts to stage to a location
@@ -263,7 +263,7 @@ class BuildElement(Element):
if commands:
with sandbox.batch(SandboxFlags.ROOT_READ_ONLY, label="Running configure-commands"):
for cmd in commands:
- self.__run_command(sandbox, cmd, 'configure-commands')
+ self.__run_command(sandbox, cmd)
def generate_script(self):
script = ""
@@ -288,7 +288,7 @@ class BuildElement(Element):
return commands
- def __run_command(self, sandbox, cmd, cmd_name):
+ def __run_command(self, sandbox, cmd):
# Note the -e switch to 'sh' means to exit with an error
# if any untested command fails.
#