Patch fetching: remove unnecessary argument
This commit is contained in:
parent
8199f22e7c
commit
8c2305e867
@ -1086,7 +1086,7 @@ def do_fetch(self, mirror_only=False):
|
|||||||
self.stage.cache_local()
|
self.stage.cache_local()
|
||||||
|
|
||||||
for patch in self.spec.patches:
|
for patch in self.spec.patches:
|
||||||
patch.fetch(self.stage)
|
patch.fetch()
|
||||||
if patch.cache():
|
if patch.cache():
|
||||||
patch.cache().cache_local()
|
patch.cache().cache_local()
|
||||||
|
|
||||||
|
@ -64,11 +64,8 @@ def __init__(self, pkg, path_or_url, level, working_dir):
|
|||||||
self.level = level
|
self.level = level
|
||||||
self.working_dir = working_dir
|
self.working_dir = working_dir
|
||||||
|
|
||||||
def fetch(self, stage):
|
def fetch(self):
|
||||||
"""Fetch the patch in case of a UrlPatch
|
"""Fetch the patch in case of a UrlPatch
|
||||||
|
|
||||||
Args:
|
|
||||||
stage: stage for the package that needs to be patched
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def clean(self):
|
def clean(self):
|
||||||
@ -185,8 +182,7 @@ def __init__(self, pkg, url, level=1, working_dir='.', ordering_key=None,
|
|||||||
if not self.sha256:
|
if not self.sha256:
|
||||||
raise PatchDirectiveError("URL patches require a sha256 checksum")
|
raise PatchDirectiveError("URL patches require a sha256 checksum")
|
||||||
|
|
||||||
# TODO: this function doesn't use the stage arg
|
def fetch(self):
|
||||||
def fetch(self, stage):
|
|
||||||
"""Retrieve the patch in a temporary stage and compute self.path
|
"""Retrieve the patch in a temporary stage and compute self.path
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
|
@ -80,7 +80,7 @@ def test_url_patch(mock_patch_stage, filename, sha256, archive_sha256):
|
|||||||
third line
|
third line
|
||||||
""")
|
""")
|
||||||
# apply the patch and compare files
|
# apply the patch and compare files
|
||||||
patch.fetch(stage)
|
patch.fetch()
|
||||||
patch.apply(stage)
|
patch.apply(stage)
|
||||||
patch.clean()
|
patch.clean()
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user