Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Spack
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
eic_tools
Spack
Commits
63915613
Unverified
Commit
63915613
authored
5 years ago
by
Peter Josef Scheibel
Committed by
Todd Gamblin
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Patch fetching: remove unnecessary argument
parent
587c650b
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
lib/spack/spack/package.py
+1
-1
1 addition, 1 deletion
lib/spack/spack/package.py
lib/spack/spack/patch.py
+2
-6
2 additions, 6 deletions
lib/spack/spack/patch.py
lib/spack/spack/test/patch.py
+1
-1
1 addition, 1 deletion
lib/spack/spack/test/patch.py
with
4 additions
and
8 deletions
lib/spack/spack/package.py
+
1
−
1
View file @
63915613
...
...
@@ -1086,7 +1086,7 @@ def do_fetch(self, mirror_only=False):
self
.
stage
.
cache_local
()
for
patch
in
self
.
spec
.
patches
:
patch
.
fetch
(
self
.
stage
)
patch
.
fetch
()
if
patch
.
cache
():
patch
.
cache
().
cache_local
()
...
...
This diff is collapsed.
Click to expand it.
lib/spack/spack/patch.py
+
2
−
6
View file @
63915613
...
...
@@ -64,11 +64,8 @@ def __init__(self, pkg, path_or_url, level, working_dir):
self
.
level
=
level
self
.
working_dir
=
working_dir
def
fetch
(
self
,
stage
):
def
fetch
(
self
):
"""
Fetch the patch in case of a UrlPatch
Args:
stage: stage for the package that needs to be patched
"""
def
clean
(
self
):
...
...
@@ -185,8 +182,7 @@ def __init__(self, pkg, url, level=1, working_dir='.', ordering_key=None,
if
not
self
.
sha256
:
raise
PatchDirectiveError
(
"
URL patches require a sha256 checksum
"
)
# TODO: this function doesn't use the stage arg
def
fetch
(
self
,
stage
):
def
fetch
(
self
):
"""
Retrieve the patch in a temporary stage and compute self.path
Args:
...
...
This diff is collapsed.
Click to expand it.
lib/spack/spack/test/patch.py
+
1
−
1
View file @
63915613
...
...
@@ -79,7 +79,7 @@ def test_url_patch(mock_patch_stage, filename, sha256, archive_sha256):
third line
"""
)
# apply the patch and compare files
patch
.
fetch
(
stage
)
patch
.
fetch
()
patch
.
apply
(
stage
)
patch
.
clean
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment