griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: prefer parenthesis over line continuations in Python scripts

Browse Source
This commit is contained in:
Campbell Barton
2025-01-21 23:30:55 +11:00
parent 70f44c6204
commit abd933d6b0
4 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/utils/blender_merge_format_changes.py
View File

@@ -65,9 +65,11 @@ def main() -> int:
rebase_merge = get_string(['git', 'rev-parse', '--git-path', 'rebase-merge'])
rebase_apply = get_string(['git', 'rev-parse', '--git-path', 'rebase-apply'])
merge_head = get_string(['git', 'rev-parse', '--git-path', 'MERGE_HEAD'])
if os.path.exists(rebase_merge) or \
os.path.exists(rebase_apply) or \
os.path.exists(merge_head):
if (
os.path.exists(rebase_merge) or
os.path.exists(rebase_apply) or
os.path.exists(merge_head)
):
print("BLENDER MERGE: rebase or merge in progress, complete it first")
return 1