[FIX] Packaging: Windows: _prepare_build_dir
Catch shutil.Error thrown when addons have already been moved to
openerp/addons. Fixes the bug introduced by commit 91026647d4
.
This commit is contained in:
parent
6ebdcbd2cd
commit
1db27f417d
|
@ -246,9 +246,14 @@ def _prepare_build_dir(o, win32=False):
|
||||||
if not win32:
|
if not win32:
|
||||||
cmd += ['--exclude', 'setup/win32']
|
cmd += ['--exclude', 'setup/win32']
|
||||||
system(cmd + ['%s/' % o.odoo_dir, o.build_dir])
|
system(cmd + ['%s/' % o.odoo_dir, o.build_dir])
|
||||||
for i in glob(join(o.build_dir, 'addons/*')):
|
try:
|
||||||
if i.split(os.path.sep)[-1] not in ADDONS_NOT_TO_PUBLISH:
|
for addon_path in glob(join(o.build_dir, 'addons/*')):
|
||||||
shutil.move(i, join(o.build_dir, 'openerp/addons'))
|
if addon_path.split(os.path.sep)[-1] not in ADDONS_NOT_TO_PUBLISH:
|
||||||
|
shutil.move(addon_path, join(o.build_dir, 'openerp/addons'))
|
||||||
|
except shutil.Error:
|
||||||
|
# Thrown when the add-on is already in openerp/addons (if _prepare_build_dir
|
||||||
|
# has already been called once)
|
||||||
|
pass
|
||||||
|
|
||||||
def build_tgz(o):
|
def build_tgz(o):
|
||||||
system(['python2', 'setup.py', 'sdist', '--quiet', '--formats=gztar,zip'], o.build_dir)
|
system(['python2', 'setup.py', 'sdist', '--quiet', '--formats=gztar,zip'], o.build_dir)
|
||||||
|
|
Loading…
Reference in New Issue