summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2017-10-30 20:09:40 +0900
committerTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2017-10-30 20:09:40 +0900
commitb87b91614476c379aa991a3d1baaf3223c5090ed (patch)
treeee347fe6c76820465db7a5bf5defc990d15d94c8
parent1dbf267aa6565bc4ad703367364dd1ee40f5bb72 (diff)
downloadbuildstream-b87b91614476c379aa991a3d1baaf3223c5090ed.tar.gz
_pipeline.py: No except_ argument in source_bundle
This is deadcode, except_ is already calculated before we get here. Updated some internal comments to reflect this, and updated the frontend to not pass the useless except_ parameter.
-rw-r--r--buildstream/_frontend/main.py2
-rw-r--r--buildstream/_pipeline.py4
2 files changed, 2 insertions, 4 deletions
diff --git a/buildstream/_frontend/main.py b/buildstream/_frontend/main.py
index ad11e1a51..2b61a596d 100644
--- a/buildstream/_frontend/main.py
+++ b/buildstream/_frontend/main.py
@@ -550,7 +550,7 @@ def source_bundle(app, target, force, directory,
dependencies = app.pipeline.deps_elements('all', except_)
app.print_heading(dependencies)
app.pipeline.source_bundle(app.scheduler, dependencies, force, track,
- compression, except_, directory)
+ compression, directory)
click.echo("")
except _BstError as e:
click.echo("")
diff --git a/buildstream/_pipeline.py b/buildstream/_pipeline.py
index dd368d8fd..6f6d40fa2 100644
--- a/buildstream/_pipeline.py
+++ b/buildstream/_pipeline.py
@@ -314,7 +314,6 @@ class Pipeline():
# Args:
# scheduler (Scheduler): The scheduler to run this pipeline on
# dependencies (list): List of elements to track
- # except_ (list): List of elements to except from tracking
#
# If no error is encountered while tracking, then the project files
# are rewritten inline.
@@ -351,7 +350,6 @@ class Pipeline():
# scheduler (Scheduler): The scheduler to run this pipeline on
# dependencies (list): List of elements to fetch
# track_first (bool): Track new source references before fetching
- # except_ (list): List of elements to except from fetching
#
def fetch(self, scheduler, dependencies, track_first):
@@ -800,7 +798,7 @@ class Pipeline():
# directory (str): The directory to checkout the artifact to
#
def source_bundle(self, scheduler, dependencies, force,
- track_first, compression, except_, directory):
+ track_first, compression, directory):
# Find the correct filename for the compression algorithm
tar_location = os.path.join(directory, self.target.normal_name + ".tar")