Commit 385955ac authored by Godefroid Chapelle's avatar Godefroid Chapelle

get verbosity from buildout option

parent dcb3630b
...@@ -1234,10 +1234,7 @@ class Buildout(DictMixin): ...@@ -1234,10 +1234,7 @@ class Buildout(DictMixin):
runsetup = setup # backward compat. runsetup = setup # backward compat.
def annotate(self, args=None): def annotate(self, args=None):
if args and "--verbose" in args: verbose = self['buildout'].get('verbosity', 0) <> 0
verbose = True
else:
verbose = False
section = None section = None
if args: if args:
for arg in args: for arg in args:
......
...@@ -864,9 +864,10 @@ the origin of the value (file name or ``COMPUTED_VALUE``, ``DEFAULT_VALUE``, ...@@ -864,9 +864,10 @@ the origin of the value (file name or ``COMPUTED_VALUE``, ``DEFAULT_VALUE``,
DEFAULT_VALUE DEFAULT_VALUE
<BLANKLINE> <BLANKLINE>
The ``annotate`` has a verbose flag. You get more information about the way values are computed:: The ``annotate`` command is sensitive to the verbosity flag.
You get more information about the way values are computed::
>>> print_(system(buildout+ ' annotate --verbose'), end='') >>> print_(system(buildout+ ' -v annotate'), end='')
... # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE ... # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
<BLANKLINE> <BLANKLINE>
Annotated sections Annotated sections
...@@ -990,6 +991,11 @@ The ``annotate`` has a verbose flag. You get more information about the way valu ...@@ -990,6 +991,11 @@ The ``annotate`` has a verbose flag. You get more information about the way valu
AS DEFAULT_VALUE AS DEFAULT_VALUE
SET VALUE = true SET VALUE = true
<BLANKLINE> <BLANKLINE>
verbosity= 10
<BLANKLINE>
AS COMMAND_LINE_VALUE
SET VALUE = 10
<BLANKLINE>
versions= versions versions= versions
<BLANKLINE> <BLANKLINE>
AS DEFAULT_VALUE AS DEFAULT_VALUE
...@@ -1590,9 +1596,9 @@ operations:: ...@@ -1590,9 +1596,9 @@ operations::
DEFAULT_VALUE DEFAULT_VALUE
<BLANKLINE> <BLANKLINE>
With --verbose:: With more verbosity::
>>> print_(system(os.path.join('bin', 'buildout') + ' annotate --verbose'), end='') >>> print_(system(os.path.join('bin', 'buildout') + ' -v annotate'), end='')
... # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE ... # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
<BLANKLINE> <BLANKLINE>
Annotated sections Annotated sections
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment