From b87b91614476c379aa991a3d1baaf3223c5090ed Mon Sep 17 00:00:00 2001 From: Tristan Van Berkom Date: Mon, 30 Oct 2017 20:09:40 +0900 Subject: _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. --- buildstream/_frontend/main.py | 2 +- buildstream/_pipeline.py | 4 +--- 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") -- cgit v1.2.1