Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

More "relpath" try/except protection...

Browse Source
This commit is contained in:
Bastien Montagne
2013-08-18 15:17:33 +00:00
parent c5e14f62a6
commit a567dd20c0
3 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
View File

@@ -410,9 +410,15 @@ def dump_py_messages_from_files(msgs, reports, files, settings):
def make_rel(path):
for rp in root_paths:
if path.startswith(rp):
return os.path.relpath(path, rp)
try: # can't always find the relative path (between drive letters on windows)
return os.path.relpath(path, rp)
except ValueError:
return path
# Use binary's dir as fallback...
return os.path.relpath(path, os.path.dirname(bpy.app.binary_path))
try: # can't always find the relative path (between drive letters on windows)
return os.path.relpath(path, os.path.dirname(bpy.app.binary_path))
except ValueError:
return path
# Helper function
def extract_strings_ex(node, is_split=False):
@@ -768,7 +774,10 @@ def dump_src_messages(msgs, reports, settings):
if os.path.splitext(fname)[1] not in settings.PYGETTEXT_ALLOWED_EXTS:
continue
path = os.path.join(root, fname)
rel_path = os.path.relpath(path, settings.SOURCE_DIR)
try: # can't always find the relative path (between drive letters on windows)
rel_path = os.path.relpath(path, settings.SOURCE_DIR)
except ValueError:
rel_path = path
if rel_path in forbidden:
continue
elif rel_path not in forced: