hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Restore verbosity of patching (#21233)

Browse source
This commit is contained in:
Adam J. Stewart 2021-02-08 12:29:19 -06:00 committed by GitHub
parent b37c601a01
commit 48954a5a3e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/spack/spack/package.py
View file

@ -1379,7 +1379,7 @@ def do_patch(self):
# If there are no patches, note it. # If there are no patches, note it.
if not patches and not has_patch_fun: if not patches and not has_patch_fun:
tty.debug('No patches needed for {0}'.format(self.name)) tty.msg('No patches needed for {0}'.format(self.name))
return return
# Construct paths to special files in the archive dir used to # Construct paths to special files in the archive dir used to
@ -1397,10 +1397,10 @@ def do_patch(self):
# If this file exists, then we already applied all the patches. # If this file exists, then we already applied all the patches.
if os.path.isfile(good_file): if os.path.isfile(good_file):
tty.debug('Already patched {0}'.format(self.name)) tty.msg('Already patched {0}'.format(self.name))
return return
elif os.path.isfile(no_patches_file): elif os.path.isfile(no_patches_file):
tty.debug('No patches needed for {0}'.format(self.name)) tty.msg('No patches needed for {0}'.format(self.name))
return return
# Apply all the patches for specs that match this one # Apply all the patches for specs that match this one
@ -1409,7 +1409,7 @@ def do_patch(self):
try: try:
with fsys.working_dir(self.stage.source_path): with fsys.working_dir(self.stage.source_path):
patch.apply(self.stage) patch.apply(self.stage)
tty.debug('Applied patch {0}'.format(patch.path_or_url)) tty.msg('Applied patch {0}'.format(patch.path_or_url))
patched = True patched = True
except spack.error.SpackError as e: except spack.error.SpackError as e:
tty.debug(e) tty.debug(e)
@ -1423,7 +1423,7 @@ def do_patch(self):
try: try:
with fsys.working_dir(self.stage.source_path): with fsys.working_dir(self.stage.source_path):
self.patch() self.patch()
tty.debug('Ran patch() for {0}'.format(self.name)) tty.msg('Ran patch() for {0}'.format(self.name))
patched = True patched = True
except spack.multimethod.NoSuchMethodError: except spack.multimethod.NoSuchMethodError:
# We are running a multimethod without a default case. # We are running a multimethod without a default case.
@ -1433,7 +1433,7 @@ def do_patch(self):
# directive, AND the patch function didn't apply, say # directive, AND the patch function didn't apply, say
# no patches are needed. Otherwise, we already # no patches are needed. Otherwise, we already
# printed a message for each patch. # printed a message for each patch.
tty.debug('No patches needed for {0}'.format(self.name)) tty.msg('No patches needed for {0}'.format(self.name))
except spack.error.SpackError as e: except spack.error.SpackError as e:
tty.debug(e) tty.debug(e)