Commit 56471ec3 authored by Julien Muchembled's avatar Julien Muchembled

Make SubversionTool.getSubversionPath look at second level of working copies

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41435 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 81290c01
...@@ -425,17 +425,23 @@ class SubversionTool(BaseTool): ...@@ -425,17 +425,23 @@ class SubversionTool(BaseTool):
raise SubversionPreferencesError, \ raise SubversionPreferencesError, \
'Please set at least one Subversion Working Copy in preferences first.' 'Please set at least one Subversion Working Copy in preferences first.'
bt_name = business_template.getTitle() bt_name = business_template.getTitle()
join = os.path.join
isdir = os.path.isdir
for working_copy in wc_list: for working_copy in wc_list:
working_copy = self._getWorkingPath(working_copy) working_copy = self._getWorkingPath(working_copy)
if bt_name in listdir(working_copy) : wc_path = join(working_copy, bt_name)
wc_path = os.path.join(working_copy, bt_name) if not isdir(wc_path):
if os.path.isdir(wc_path): for d in listdir(working_copy):
wc_path = join(working_copy, d, bt_name)
if isdir(wc_path):
break
else:
continue
if with_name: if with_name:
return wc_path return wc_path
else: return os.path.dirname(wc_path)
return os.sep.join(wc_path.split(os.sep)[:-1]) raise SubversionUnknownBusinessTemplateError(
raise SubversionUnknownBusinessTemplateError, \ "Could not find %r at first or second level of working copies." % bt_name)
"Could not find '%s' at first level of working copies." % (bt_name, )
def _getWorkingPath(self, path): def _getWorkingPath(self, path):
""" Check if the given path is reachable (allowed) """ Check if the given path is reachable (allowed)
......
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