Commit 685bde89 authored by Yoshinori Okuji's avatar Yoshinori Okuji

Oops... The previous change was not good.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17283 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent fa570fb7
...@@ -4763,14 +4763,14 @@ Business Template is a set of definitions, such as skins, portal types and categ ...@@ -4763,14 +4763,14 @@ Business Template is a set of definitions, such as skins, portal types and categ
for dependency_couple in dependency_list: for dependency_couple in dependency_list:
dependency_couple_list = dependency_couple.strip().split(' ', 1) dependency_couple_list = dependency_couple.strip().split(' ', 1)
dependency = dependency_couple_list[0] dependency = dependency_couple_list[0]
if dependency.startswith('('):
# Something like "(>= 1.0rc6)".
dependency = dependency[1:-1]
if dependency in (None, ''): if dependency in (None, ''):
continue continue
version_restriction = None version_restriction = None
if len(dependency_couple_list) > 1: if len(dependency_couple_list) > 1:
version_restriction = dependency_couple_list[1] version_restriction = dependency_couple_list[1]
if version_restriction.startswith('('):
# Something like "(>= 1.0rc6)".
version_restriction = version_restriction[1:-1]
installed_bt = self.portal_templates.getInstalledBusinessTemplate(dependency) installed_bt = self.portal_templates.getInstalledBusinessTemplate(dependency)
if (not self.portal_templates.IsOneProviderInstalled(dependency)) \ if (not self.portal_templates.IsOneProviderInstalled(dependency)) \
and ((installed_bt is None) \ and ((installed_bt is None) \
......
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