Skip to content

Commit 3f41dc5

Browse files
committed
Unreal: fix p4 commandlet args nop4* showing when False
Use getattr method with default instead, defaults visible
1 parent b1b06dc commit 3f41dc5

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

nimp/unreal.py

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -561,18 +561,22 @@ def get_default_args_for_cli(env):
561561
yield f"-DDC={ddc_env_override}"
562562

563563

564-
def get_p4_args_for_commandlet(env):
564+
def get_p4_args_for_commandlet(env) -> list[str]:
565+
if getattr(env, 'nop4', False):
566+
return ['-SCCProvider=None']
567+
565568
p4_args_for_commandlet = []
566-
if env.has_attribute('nop4submit'):
569+
570+
if getattr(env, 'nop4submit', False):
567571
p4_args_for_commandlet.append('-DisableSCCSubmit')
568-
if env.has_attribute('p4port'):
569-
p4_args_for_commandlet.append('-P4Port=%s' % env.p4port)
570-
if env.has_attribute('p4user'):
571-
p4_args_for_commandlet.append('-P4User=%s' % env.p4user)
572-
if env.has_attribute('p4pass'):
573-
p4_args_for_commandlet.append('-P4Passwd=%s' % env.p4pass)
574-
if env.has_attribute('p4client'):
575-
p4_args_for_commandlet.append('-P4Client=%s' % env.p4client)
572+
if getattr(env, 'p4port', None):
573+
p4_args_for_commandlet.append(f'-P4Port={env.p4port}')
574+
if getattr(env, 'p4user', None):
575+
p4_args_for_commandlet.append(f'-P4User={env.p4user}')
576+
if getattr(env, 'p4pass', None):
577+
p4_args_for_commandlet.append(f'-P4Passwd={env.p4pass}')
578+
if getattr(env, 'p4client', None):
579+
p4_args_for_commandlet.append(f'-P4Client={env.p4pass}')
576580
if len(p4_args_for_commandlet) > 0:
577581
p4_args_for_commandlet.append('-SCCProvider=Perforce')
578582
if getattr(env, "auto_submit", False):

0 commit comments

Comments
 (0)