diff options
| author | Benjamin Schubert <ben.c.schubert@gmail.com> | 2019-06-10 10:18:24 +0100 |
|---|---|---|
| committer | Benjamin Schubert <ben.c.schubert@gmail.com> | 2019-06-10 10:18:24 +0100 |
| commit | 5a4907e3c4a588e40776805bf221fc29ff119f39 (patch) | |
| tree | 6fa8064455aeaabe5e3d846c368ca4ffbf72e10d | |
| parent | bb0b3e44af6f90c4fa8471c042e3b51cef6bc65d (diff) | |
| download | buildstream-5a4907e3c4a588e40776805bf221fc29ff119f39.tar.gz | |
plugins/sources: Remove 'or None' call that will never be true
Since node_get_member has a default value passed in, it is impossible
for the method to return 'None'
| -rw-r--r-- | src/buildstream/plugins/sources/tar.py | 2 | ||||
| -rw-r--r-- | src/buildstream/plugins/sources/zip.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/buildstream/plugins/sources/tar.py b/src/buildstream/plugins/sources/tar.py index 31dc17497..c90de74ea 100644 --- a/src/buildstream/plugins/sources/tar.py +++ b/src/buildstream/plugins/sources/tar.py @@ -72,7 +72,7 @@ class TarSource(DownloadableFileSource): def configure(self, node): super().configure(node) - self.base_dir = self.node_get_member(node, str, 'base-dir', '*') or None + self.base_dir = self.node_get_member(node, str, 'base-dir', '*') self.node_validate(node, DownloadableFileSource.COMMON_CONFIG_KEYS + ['base-dir']) diff --git a/src/buildstream/plugins/sources/zip.py b/src/buildstream/plugins/sources/zip.py index 03efcef79..9981f1260 100644 --- a/src/buildstream/plugins/sources/zip.py +++ b/src/buildstream/plugins/sources/zip.py @@ -72,7 +72,7 @@ class ZipSource(DownloadableFileSource): def configure(self, node): super().configure(node) - self.base_dir = self.node_get_member(node, str, 'base-dir', '*') or None + self.base_dir = self.node_get_member(node, str, 'base-dir', '*') self.node_validate(node, DownloadableFileSource.COMMON_CONFIG_KEYS + ['base-dir']) |