RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

makepanda: Don't try to call interrogate_module with -vv

This commit is contained in:
rdb 2025-02-02 20:06:46 +01:00
parent b0e1e0c75a
commit 3f0f90d83d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
makepanda/makepandacore.py
View File

@ -666,11 +666,12 @@ def oscmd(cmd, ignoreError = False, cwd=None):
print(GetColor("blue") + cmd.split(" ", 1)[0] + " " + GetColor("magenta") + cmd.split(" ", 1)[1] + GetColor())
sys.stdout.flush()
if cmd[0] == '"':
exe = cmd[1 : cmd.index('"', 1)]
else:
exe = cmd.split()[0]
if sys.platform == "win32":
if cmd[0] == '"':
exe = cmd[1 : cmd.index('"', 1)]
else:
exe = cmd.split()[0]
exe_path = LocateBinary(exe)
if exe_path is None:
exit("Cannot find "+exe+" on search path")
@ -706,7 +707,7 @@ def oscmd(cmd, ignoreError = False, cwd=None):
exit("")
if res != 0 and not ignoreError:
if "interrogate" in cmd.split(" ", 1)[0] and GetVerbose():
if "interrogate" in exe and "interrogate_module" not in exe and GetVerbose():
print(ColorText("red", "Interrogate failed, retrieving debug output..."))
sys.stdout.flush()
verbose_cmd = cmd.split(" ", 1)[0] + " -vv " + cmd.split(" ", 1)[1]