Commit 33e0721a authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki Committed by Julien Muchembled

Add '--dry-run' option.

parent 8be81fe4
...@@ -167,6 +167,7 @@ _buildout_default_options = _annotate_section({ ...@@ -167,6 +167,7 @@ _buildout_default_options = _annotate_section({
'log-level': 'INFO', 'log-level': 'INFO',
'newest': 'true', 'newest': 'true',
'offline': 'false', 'offline': 'false',
'dry-run': 'false',
'parts-directory': 'parts', 'parts-directory': 'parts',
'prefer-final': 'true', 'prefer-final': 'true',
'python': 'buildout', 'python': 'buildout',
...@@ -345,6 +346,7 @@ class Buildout(DictMixin): ...@@ -345,6 +346,7 @@ class Buildout(DictMixin):
self.newest = ((not self.offline) and self.newest = ((not self.offline) and
bool_option(buildout_section, 'newest') bool_option(buildout_section, 'newest')
) )
self.dry_run = (buildout_section['dry-run'] == 'true')
################################################################## ##################################################################
## WARNING!!! ## WARNING!!!
...@@ -697,6 +699,8 @@ class Buildout(DictMixin): ...@@ -697,6 +699,8 @@ class Buildout(DictMixin):
if part in installed_parts: # update if part in installed_parts: # update
__doing__ = 'Updating %s.', part __doing__ = 'Updating %s.', part
self._logger.info(*__doing__) self._logger.info(*__doing__)
if self.dry_run:
continue
old_options = installed_part_options[part] old_options = installed_part_options[part]
installed_files = old_options['__buildout_installed__'] installed_files = old_options['__buildout_installed__']
...@@ -727,6 +731,8 @@ class Buildout(DictMixin): ...@@ -727,6 +731,8 @@ class Buildout(DictMixin):
else: # install else: # install
__doing__ = 'Installing %s.', part __doing__ = 'Installing %s.', part
self._logger.info(*__doing__) self._logger.info(*__doing__)
if self.dry_run:
continue
installed_files = self[part]._call(recipe.install) installed_files = self[part]._call(recipe.install)
if installed_files is None: if installed_files is None:
self._logger.warning( self._logger.warning(
...@@ -754,6 +760,8 @@ class Buildout(DictMixin): ...@@ -754,6 +760,8 @@ class Buildout(DictMixin):
# uninstall part # uninstall part
__doing__ = 'Uninstalling %s.', part __doing__ = 'Uninstalling %s.', part
self._logger.info(*__doing__) self._logger.info(*__doing__)
if self.dry_run:
return
# run uuinstall recipe # run uuinstall recipe
recipe, entry = _recipe(installed_part_options[part]) recipe, entry = _recipe(installed_part_options[part])
...@@ -924,6 +932,8 @@ class Buildout(DictMixin): ...@@ -924,6 +932,8 @@ class Buildout(DictMixin):
def _save_installed_options(self): def _save_installed_options(self):
if self.dry_run:
return
installed_path = self['buildout']['installed'] installed_path = self['buildout']['installed']
if not installed_path: if not installed_path:
return return
...@@ -1946,6 +1956,12 @@ Options: ...@@ -1946,6 +1956,12 @@ Options:
will be started. This is especially useful for debuging recipe will be started. This is especially useful for debuging recipe
problems. problems.
--dry-run
Dry-run mode. With this setting, buildout will display what will
be uninstalled and what will be installed without doing anything
in reality.
Assignments are of the form: section:option=value and are used to Assignments are of the form: section:option=value and are used to
provide configuration options that override those given in the provide configuration options that override those given in the
configuration file. For example, to run the buildout in offline mode, configuration file. For example, to run the buildout in offline mode,
...@@ -2064,12 +2080,15 @@ def main(args=None): ...@@ -2064,12 +2080,15 @@ def main(args=None):
_error("No timeout value specified for option", orig_op) _error("No timeout value specified for option", orig_op)
except ValueError: except ValueError:
_error("Timeout value must be numeric", orig_op) _error("Timeout value must be numeric", orig_op)
elif orig_op == '--dry-run':
options.append(('buildout', 'dry-run', 'true'))
elif op: elif op:
if orig_op == '--help': if orig_op == '--help':
_help() _help()
elif orig_op == '--version': elif orig_op == '--version':
_version() _version()
_error("Invalid option", '-'+op[0]) _error("Invalid option", orig_op)
elif '=' in args[0]: elif '=' in args[0]:
option, value = args.pop(0).split('=', 1) option, value = args.pop(0).split('=', 1)
option = option.split(':') option = option.split(':')
......
...@@ -335,6 +335,10 @@ we'll see that the directory gets removed and recreated:: ...@@ -335,6 +335,10 @@ we'll see that the directory gets removed and recreated::
... path = mydata ... path = mydata
... """) ... """)
>>> print_(system(buildout+' --dry-run'), end='')
Develop: '/sample-buildout/recipes'
Uninstalling data-dir.
Installing data-dir.
>>> print_(system(buildout), end='') >>> print_(system(buildout), end='')
Develop: '/sample-buildout/recipes' Develop: '/sample-buildout/recipes'
Uninstalling data-dir. Uninstalling data-dir.
...@@ -355,6 +359,10 @@ If any of the files or directories created by a recipe are removed, ...@@ -355,6 +359,10 @@ If any of the files or directories created by a recipe are removed,
the part will be reinstalled:: the part will be reinstalled::
>>> rmdir(sample_buildout, 'mydata') >>> rmdir(sample_buildout, 'mydata')
>>> print_(system(buildout+' --dry-run'), end='')
Develop: '/sample-buildout/recipes'
Uninstalling data-dir.
Installing data-dir.
>>> print_(system(buildout), end='') >>> print_(system(buildout), end='')
Develop: '/sample-buildout/recipes' Develop: '/sample-buildout/recipes'
Uninstalling data-dir. Uninstalling data-dir.
...@@ -812,6 +820,8 @@ the origin of the value (file name or ``COMPUTED_VALUE``, ``DEFAULT_VALUE``, ...@@ -812,6 +820,8 @@ the origin of the value (file name or ``COMPUTED_VALUE``, ``DEFAULT_VALUE``,
DEFAULT_VALUE DEFAULT_VALUE
directory= /sample-buildout directory= /sample-buildout
COMPUTED_VALUE COMPUTED_VALUE
dry-run= false
DEFAULT_VALUE
eggs-directory= /sample-buildout/eggs eggs-directory= /sample-buildout/eggs
DEFAULT_VALUE DEFAULT_VALUE
executable= ... executable= ...
...@@ -2763,6 +2773,7 @@ database is shown:: ...@@ -2763,6 +2773,7 @@ database is shown::
bin-directory = /sample-buildout/bin bin-directory = /sample-buildout/bin
develop-eggs-directory = /sample-buildout/develop-eggs develop-eggs-directory = /sample-buildout/develop-eggs
directory = /sample-buildout directory = /sample-buildout
dry-run = false
eggs-directory = /sample-buildout/eggs eggs-directory = /sample-buildout/eggs
executable = python executable = python
find-links = find-links =
......
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