summaryrefslogtreecommitdiff
path: root/buildstream/_artifact.py
diff options
context:
space:
mode:
authorTom Pollard <tom.pollard@codethink.co.uk>2019-04-25 17:36:35 +0100
committerTom Pollard <tom.pollard@codethink.co.uk>2019-04-26 11:00:39 +0100
commit222776d6ec4c1b350e0c43bfa8c678d88aa9af02 (patch)
treeb83a719ccd04843796b49b4697568d7f2f0a68b9 /buildstream/_artifact.py
parentee5636cd1f99a1df2e7b68efa3d7ffa2e560b512 (diff)
downloadbuildstream-222776d6ec4c1b350e0c43bfa8c678d88aa9af02.tar.gz
_artifact.py: Remove the returned key from the get_$subdir methods
As with the metadata simplification, the key is internalised to the element's Artifact member as such it is redudant to return the key which was used.
Diffstat (limited to 'buildstream/_artifact.py')
-rw-r--r--buildstream/_artifact.py12
1 files changed, 4 insertions, 8 deletions
diff --git a/buildstream/_artifact.py b/buildstream/_artifact.py
index 81b9f3642..d2fdd0f34 100644
--- a/buildstream/_artifact.py
+++ b/buildstream/_artifact.py
@@ -67,12 +67,10 @@ class Artifact():
#
# Returns:
# (Directory): The virtual directory object
- # (str): The chosen key
#
def get_files(self):
- subdir = "files"
-
- return self._get_subdirectory(subdir)
+ files, _ = self._get_subdirectory("files")
+ return files
# get_buildtree():
#
@@ -80,12 +78,10 @@ class Artifact():
#
# Returns:
# (Directory): The virtual directory object
- # (str): The chosen key
#
def get_buildtree(self):
- subdir = "buildtree"
-
- return self._get_subdirectory(subdir)
+ buildtree, _ = self._get_subdirectory("buildtree")
+ return buildtree
# get_extract_key():
#