zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More consistent colored messages from activate/deactivate (#9036)

Browse Source 
* More consistent colored messages from activate/deactivate

* Make 'activating' the default, make 'activated' the debug
This commit is contained in:
Adam J. Stewart 2018-08-23 00:09:51 -05:00 committed by Todd Gamblin
parent 05c4ff4e92
commit 5e8a9ddaed
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/spack/spack/package.py
View File

@ -1957,8 +1957,8 @@ def do_activate(self, view=None, with_dependencies=True, verbose=True):
activate() directly. activate() directly.
""" """
if verbose: if verbose:
tty.msg("Activating extension %s for %s" % tty.msg('Activating extension {0} for {1}'.format(
(self.spec.cshort_spec, self.extendee_spec.cshort_spec)) self.spec.cshort_spec, self.extendee_spec.cshort_spec))
self._sanity_check_extension() self._sanity_check_extension()
if not view: if not view:
@ -1984,10 +1984,8 @@ def do_activate(self, view=None, with_dependencies=True, verbose=True):
extensions_layout.add_extension(self.extendee_spec, self.spec) extensions_layout.add_extension(self.extendee_spec, self.spec)
if verbose: if verbose:
tty.msg( tty.debug('Activated extension {0} for {1}'.format(
"Activated extension %s for %s" % self.spec.cshort_spec, self.extendee_spec.cshort_spec))
(self.spec.short_spec,
self.extendee_spec.cformat("$_$@$+$%@")))
def dependency_activations(self): def dependency_activations(self):
return (spec for spec in self.spec.traverse(root=False, deptype='run') return (spec for spec in self.spec.traverse(root=False, deptype='run')
@ -2015,8 +2013,12 @@ def do_deactivate(self, view=None, **kwargs):
""" """
self._sanity_check_extension() self._sanity_check_extension()
force = kwargs.get('force', False) force = kwargs.get('force', False)
verbose = kwargs.get("verbose", True) verbose = kwargs.get('verbose', True)
remove_dependents = kwargs.get("remove_dependents", False) remove_dependents = kwargs.get('remove_dependents', False)
if verbose:
tty.msg('Deactivating extension {0} for {1}'.format(
self.spec.cshort_spec, self.extendee_spec.cshort_spec))
if not view: if not view:
view = YamlFilesystemView( view = YamlFilesystemView(
@ -2039,11 +2041,10 @@ def do_deactivate(self, view=None, **kwargs):
if remove_dependents: if remove_dependents:
aspec.package.do_deactivate(**kwargs) aspec.package.do_deactivate(**kwargs)
else: else:
msg = ("Cannot deactivate %s because %s is " msg = ('Cannot deactivate {0} because {1} is '
"activated and depends on it.") 'activated and depends on it')
raise ActivationError( raise ActivationError(msg.format(
msg % (self.spec.cshort_spec, self.spec.cshort_spec, aspec.cshort_spec))
aspec.cshort_spec))
self.extendee_spec.package.deactivate( self.extendee_spec.package.deactivate(
self, view, **self.extendee_args) self, view, **self.extendee_args)
@ -2055,10 +2056,8 @@ def do_deactivate(self, view=None, **kwargs):
self.extendee_spec, self.spec) self.extendee_spec, self.spec)
if verbose: if verbose:
tty.msg( tty.debug('Deactivated extension {0} for {1}'.format(
"Deactivated extension %s for %s" % self.spec.cshort_spec, self.extendee_spec.cshort_spec))
(self.spec.short_spec,
self.extendee_spec.cformat("$_$@$+$%@")))
def deactivate(self, extension, view, **kwargs): def deactivate(self, extension, view, **kwargs):
""" """