Skip to content

Commit

Permalink
Unreal: fix p4 commandlet args nop4* showing when False
Browse files Browse the repository at this point in the history
Use getattr method with default instead, defaults visible
  • Loading branch information
jasugun committed Dec 2, 2024
1 parent b1b06dc commit 3f41dc5
Showing 1 changed file with 14 additions and 10 deletions.
24 changes: 14 additions & 10 deletions nimp/unreal.py
Original file line number Diff line number Diff line change
Expand Up @@ -561,18 +561,22 @@ def get_default_args_for_cli(env):
yield f"-DDC={ddc_env_override}"


def get_p4_args_for_commandlet(env):
def get_p4_args_for_commandlet(env) -> list[str]:
if getattr(env, 'nop4', False):
return ['-SCCProvider=None']

p4_args_for_commandlet = []
if env.has_attribute('nop4submit'):

if getattr(env, 'nop4submit', False):
p4_args_for_commandlet.append('-DisableSCCSubmit')
if env.has_attribute('p4port'):
p4_args_for_commandlet.append('-P4Port=%s' % env.p4port)
if env.has_attribute('p4user'):
p4_args_for_commandlet.append('-P4User=%s' % env.p4user)
if env.has_attribute('p4pass'):
p4_args_for_commandlet.append('-P4Passwd=%s' % env.p4pass)
if env.has_attribute('p4client'):
p4_args_for_commandlet.append('-P4Client=%s' % env.p4client)
if getattr(env, 'p4port', None):
p4_args_for_commandlet.append(f'-P4Port={env.p4port}')
if getattr(env, 'p4user', None):
p4_args_for_commandlet.append(f'-P4User={env.p4user}')
if getattr(env, 'p4pass', None):
p4_args_for_commandlet.append(f'-P4Passwd={env.p4pass}')
if getattr(env, 'p4client', None):
p4_args_for_commandlet.append(f'-P4Client={env.p4pass}')
if len(p4_args_for_commandlet) > 0:
p4_args_for_commandlet.append('-SCCProvider=Perforce')
if getattr(env, "auto_submit", False):
Expand Down

0 comments on commit 3f41dc5

Please sign in to comment.