Commit 3351ae39 authored by Vincent Pelletier's avatar Vincent Pelletier

Revert previous patch: no error must be emmited if codification path is found...

Revert previous patch: no error must be emmited if codification path is found but is an empty string.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18551 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent e88bc8a7
...@@ -971,10 +971,11 @@ class BaobabConduit(ERP5Conduit): ...@@ -971,10 +971,11 @@ class BaobabConduit(ERP5Conduit):
if inventory_path is not None: if inventory_path is not None:
result_list.append(inventory_path) result_list.append(inventory_path)
vault_path = self.vault_code_to_path.get(vault_code) vault_path = self.vault_code_to_path.get(vault_code)
if vault_path not in (None, ''): if vault_path != '':
result_list.append(vault_path) if vault_path is not None:
elif vault_code is not None: result_list.append(vault_path)
raise ValueError, '%s is not a known vault import codification' % (vault_code, ) elif vault_code is not None:
raise ValueError, '%s is not a known vault import codification' % (vault_code, )
elif inventory_code is not None: elif inventory_code is not None:
raise ValueError, '%s is not a known inventory import codification' % (inventory_code, ) raise ValueError, '%s is not a known inventory import codification' % (inventory_code, )
if len(result_list) == 0: if len(result_list) == 0:
......
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