Commit 3d81eb00 authored by Julien Muchembled's avatar Julien Muchembled Committed by Xavier Thompson

Check that sections don't installed the same path

parent b179a500
...@@ -771,7 +771,9 @@ class Buildout(DictMixin): ...@@ -771,7 +771,9 @@ class Buildout(DictMixin):
# Check for unused buildout options: # Check for unused buildout options:
_check_for_unused_options_in_section(self, 'buildout') _check_for_unused_options_in_section(self, 'buildout')
# install new parts # install new parts
all_installed_paths = {}
for part in install_parts: for part in install_parts:
signature = self[part].pop('__buildout_signature__') signature = self[part].pop('__buildout_signature__')
saved_options = self[part].copy() saved_options = self[part].copy()
...@@ -802,11 +804,11 @@ class Buildout(DictMixin): ...@@ -802,11 +804,11 @@ class Buildout(DictMixin):
' '.join(installed_parts)) ' '.join(installed_parts))
raise raise
installed_files = set(installed_files.split('\n')) \
if installed_files else set()
if updated_files: if updated_files:
installed_files = set(installed_files.split('\n'))
(installed_files.add if isinstance(updated_files, str) else (installed_files.add if isinstance(updated_files, str) else
installed_files.update)(updated_files) installed_files.update)(updated_files)
installed_files = '\n'.join(sorted(installed_files))
else: # install else: # install
__doing__ = 'Installing %s.', part __doing__ = 'Installing %s.', part
...@@ -819,9 +821,23 @@ class Buildout(DictMixin): ...@@ -819,9 +821,23 @@ class Buildout(DictMixin):
"The %s install returned None. A path or " "The %s install returned None. A path or "
"iterable os paths should be returned.", "iterable os paths should be returned.",
part) part)
installed_files = "" elif installed_files:
elif not isinstance(installed_files, str): installed_files = ({installed_files}
installed_files = '\n'.join(installed_files) if isinstance(installed_files, str) else
set(installed_files))
if installed_files:
conflicts = installed_files.intersection(
all_installed_paths)
if conflicts:
self._error(
"The following paths are already"
" installed by other sections: %r",
{x: all_installed_paths[x] for x in conflicts})
all_installed_paths.update(dict.fromkeys(installed_files, part))
installed_files = '\n'.join(sorted(installed_files))
else:
installed_files = ''
saved_options['__buildout_installed__'] = installed_files saved_options['__buildout_installed__'] = installed_files
saved_options['__buildout_signature__'] = signature saved_options['__buildout_signature__'] = signature
......
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