diff options
| author | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2018-04-07 19:18:50 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2018-04-07 19:30:47 +0900 |
| commit | 60dbf19ffbc9ec4300acc79689d173af7c830c0c (patch) | |
| tree | ff5052eba64945acd23e6afdbbc9fe6ebbe65341 /buildstream/plugins/sources/_downloadablefilesource.py | |
| parent | 3ba544b80f9f268be8ffe62fc8589b30212ec4a2 (diff) | |
| download | buildstream-60dbf19ffbc9ec4300acc79689d173af7c830c0c.tar.gz | |
Complete the work started to allow None as default in _yaml.node_get()
This completes the work which was started in commit
3ba544b80f9f268be8ffe62fc8589b30212ec4a2 which only went half
way towards updating all the source code to be consistent and use
the new semantic which allows None values.
Diffstat (limited to 'buildstream/plugins/sources/_downloadablefilesource.py')
| -rw-r--r-- | buildstream/plugins/sources/_downloadablefilesource.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/buildstream/plugins/sources/_downloadablefilesource.py b/buildstream/plugins/sources/_downloadablefilesource.py index fd7c7fac5..d9128ce3f 100644 --- a/buildstream/plugins/sources/_downloadablefilesource.py +++ b/buildstream/plugins/sources/_downloadablefilesource.py @@ -16,8 +16,8 @@ class DownloadableFileSource(Source): def configure(self, node): self.original_url = self.node_get_member(node, str, 'url') - self.ref = self.node_get_member(node, str, 'ref', '') or None - self.etag = self.node_get_member(node, str, 'etag', '') or None + self.ref = self.node_get_member(node, str, 'ref', None) + self.etag = self.node_get_member(node, str, 'etag', None) self.url = self.translate_url(self.original_url) def preflight(self): @@ -37,8 +37,8 @@ class DownloadableFileSource(Source): return Consistency.RESOLVED def load_ref(self, node): - self.ref = self.node_get_member(node, str, 'ref', '') or None - self.etag = self.node_get_member(node, str, 'etag', '') or None + self.ref = self.node_get_member(node, str, 'ref', None) + self.etag = self.node_get_member(node, str, 'etag', None) def get_ref(self): # Report `None` value if we dont have a ref |