diff options
| author | bst-marge-bot <marge-bot@buildstream.build> | 2019-07-02 19:33:27 +0000 |
|---|---|---|
| committer | bst-marge-bot <marge-bot@buildstream.build> | 2019-07-02 19:33:27 +0000 |
| commit | 1a34455def3493a3568bede27443a0b9a1e8fcd1 (patch) | |
| tree | 56872c7f196c5caaeba5adbbe204cdaa53a99286 | |
| parent | eb30ffba4d7d1d308dd3545b3351f3d5d8a1844e (diff) | |
| parent | 03ef8105fbf493913d9aa6e7f5bc8e84422fcb9a (diff) | |
| download | buildstream-1a34455def3493a3568bede27443a0b9a1e8fcd1.tar.gz | |
Merge branch 'aevri/context_nitpicks' into 'master'
Minor fixups in _context.py
See merge request BuildStream/buildstream!1443
| -rw-r--r-- | src/buildstream/_context.py | 7 | ||||
| -rw-r--r-- | src/buildstream/_frontend/app.py | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/buildstream/_context.py b/src/buildstream/_context.py index 3f6e6ac3c..c97acc70e 100644 --- a/src/buildstream/_context.py +++ b/src/buildstream/_context.py @@ -49,12 +49,9 @@ from .sandbox import SandboxRemote # verbosity levels and basically anything pertaining to the context # in which BuildStream was invoked. # -# Args: -# directory (str): The directory that buildstream was invoked in -# class Context(): - def __init__(self, directory=None): + def __init__(self): # Filename indicating which configuration file was used, or None for the defaults self.config_origin = None @@ -166,7 +163,6 @@ class Context(): self._log_filename = None self._cascache = None self._casquota = None - self._directory = directory # load() # @@ -175,7 +171,6 @@ class Context(): # Args: # config (filename): The user specified configuration file, if any # - # Raises: # LoadError # diff --git a/src/buildstream/_frontend/app.py b/src/buildstream/_frontend/app.py index a0b1d4cba..dafde153c 100644 --- a/src/buildstream/_frontend/app.py +++ b/src/buildstream/_frontend/app.py @@ -172,7 +172,7 @@ class App(): # Load the Context # try: - self.context = Context(directory) + self.context = Context() self.context.load(config) except BstError as e: self._error_exit(e, "Error loading user configuration") |