From 5ec4da2ee251a1ec422378632b6c4a3e10b92da1 Mon Sep 17 00:00:00 2001 From: xmo-odoo Date: Wed, 6 Mar 2019 15:02:38 +0000 Subject: [IMP] base_module_import: ignore garbage directories MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If the zipfile contains some garbage directories (e.g. leftover empty directories from git, `__MACOSX` metadata folder, …) it seems unnecessary to log an error, just skip the directory and don't mark it as a proper / successful module. closes odoo/odoo#31639 Signed-off-by: Xavier Morel (xmo) --- addons/base_import_module/models/ir_module.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'addons/base_import_module') diff --git a/addons/base_import_module/models/ir_module.py b/addons/base_import_module/models/ir_module.py index e0b18dd355a..ff55205bdf2 100644 --- a/addons/base_import_module/models/ir_module.py +++ b/addons/base_import_module/models/ir_module.py @@ -28,6 +28,8 @@ class IrModule(models.Model): installed_mods = [m.name for m in known_mods if m.state == 'installed'] terp = load_information_from_description_file(module, mod_path=path) + if not terp: + return False values = self.get_values_from_terp(terp) unmet_dependencies = set(terp['depends']).difference(installed_mods) @@ -110,8 +112,8 @@ class IrModule(models.Model): try: # assert mod_name.startswith('theme_') path = opj(module_dir, mod_name) - self.import_module(mod_name, path, force=force) - success.append(mod_name) + if self.import_module(mod_name, path, force=force): + success.append(mod_name) except Exception, e: _logger.exception('Error while importing module') errors[mod_name] = exception_to_unicode(e) -- cgit v1.2.3 From 610ab82b51937beccdc3e69dc55b6f843047cae5 Mon Sep 17 00:00:00 2001 From: Odoo Translation Bot Date: Sun, 7 Apr 2019 03:14:49 +0200 Subject: [I18N] Update translation terms from Transifex --- addons/base_import_module/i18n/he.po | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) (limited to 'addons/base_import_module') diff --git a/addons/base_import_module/i18n/he.po b/addons/base_import_module/i18n/he.po index c7af9ef665d..b49a68417e5 100644 --- a/addons/base_import_module/i18n/he.po +++ b/addons/base_import_module/i18n/he.po @@ -6,6 +6,7 @@ # Yihya Hugirat , 2018 # Martin Trigaux, 2018 # ExcaliberX , 2018 +# דודי מלכה , 2019 # msgid "" msgstr "" @@ -13,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-10-24 09:00+0000\n" "PO-Revision-Date: 2017-09-20 10:15+0000\n" -"Last-Translator: ExcaliberX , 2018\n" +"Last-Translator: דודי מלכה , 2019\n" "Language-Team: Hebrew (https://www.transifex.com/odoo/teams/41243/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -35,7 +36,7 @@ msgstr "סגור" #: code:addons/base_import_module/controllers/main.py:31 #, python-format msgid "Could not select database '%s'" -msgstr "" +msgstr "לא ניתן לבחור מסד נתונים '%s'" #. module: base_import_module #: model:ir.model.fields,field_description:base_import_module.field_base_import_module_create_uid @@ -56,7 +57,7 @@ msgstr "השם המוצג" #: code:addons/base_import_module/models/ir_module.py:112 #, python-format msgid "File '%s' exceed maximum allowed file size" -msgstr "" +msgstr "שדה '%s' גודל הקובץ המרבי המותר" #. module: base_import_module #: code:addons/base_import_module/models/ir_module.py:104 @@ -67,13 +68,13 @@ msgstr "" #. module: base_import_module #: model:ir.model.fields,field_description:base_import_module.field_base_import_module_force msgid "Force init" -msgstr "" +msgstr "לכפות אתחול" #. module: base_import_module #: model:ir.model.fields,help:base_import_module.field_base_import_module_force msgid "" "Force init mode even if installed. (will update `noupdate='1'` records)" -msgstr "" +msgstr "פה את מצב ההתחלה גם אם מותקן. (עדכון 'noupdate =' 1 'רשומות)" #. module: base_import_module #: model:ir.model.fields,field_description:base_import_module.field_base_import_module_id @@ -83,12 +84,12 @@ msgstr "מזהה" #. module: base_import_module #: model:ir.ui.view,arch_db:base_import_module.view_base_module_import msgid "Import App" -msgstr "" +msgstr "ייבוא יישומון" #. module: base_import_module #: model:ir.model.fields,field_description:base_import_module.field_base_import_module_import_message msgid "Import Message" -msgstr "" +msgstr "ייבוא הודעות" #. module: base_import_module #: model:ir.actions.act_window,name:base_import_module.action_view_base_module_import @@ -96,7 +97,7 @@ msgstr "" #: model:ir.ui.menu,name:base_import_module.menu_view_base_module_import #: model:ir.ui.view,arch_db:base_import_module.view_base_module_import msgid "Import Module" -msgstr "" +msgstr "מודול ייבוא" #. module: base_import_module #: model:ir.ui.view,arch_db:base_import_module.view_base_module_import @@ -106,7 +107,7 @@ msgstr "ייבוא מודול" #. module: base_import_module #: model:ir.model.fields,field_description:base_import_module.field_ir_module_module_imported msgid "Imported Module" -msgstr "" +msgstr "מודול מיובא" #. module: base_import_module #: model:ir.model.fields,field_description:base_import_module.field_base_import_module___last_update @@ -137,28 +138,28 @@ msgstr "מודול בקובץ .ZIP" #: code:addons/base_import_module/models/ir_module.py:102 #, python-format msgid "No file sent." -msgstr "" +msgstr "לא נשלח קובץ." #. module: base_import_module #: model:ir.ui.view,arch_db:base_import_module.view_base_module_import msgid "Note: you can only import data modules (.xml files and static assets)" -msgstr "" +msgstr "הערה: ניתן לייבא רק מודולי נתונים (קובצי .xml ונכסים סטטיים)" #. module: base_import_module #: code:addons/base_import_module/controllers/main.py:25 #, python-format msgid "Only administrators can upload a module" -msgstr "" +msgstr "רק מנהלים יכולים לטעון מודול" #. module: base_import_module #: model:ir.ui.view,arch_db:base_import_module.view_base_module_import msgid "Open Modules" -msgstr "" +msgstr "פתח מודולים" #. module: base_import_module #: model:ir.ui.view,arch_db:base_import_module.view_base_module_import msgid "Select module package to import (.zip file):" -msgstr "" +msgstr "בחר חבילת מודול לייבוא (קובץ zip):" #. module: base_import_module #: model:ir.model.fields,field_description:base_import_module.field_base_import_module_state @@ -170,7 +171,7 @@ msgstr "סטטוס" #: code:addons/base_import_module/models/ir_module.py:47 #, python-format msgid "Studio customizations require Studio" -msgstr "" +msgstr "ההתאמות של סטודיו דורשות סטודיו" #. module: base_import_module #: code:addons/base_import_module/models/ir_module.py:42 -- cgit v1.2.3