From bd6ff6717a2af31db3f5b784bd2595efec76e9d4 Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 17 Aug 2023 18:36:15 -0700 Subject: [PATCH] tidying --- .efrocachemap | 32 ++++++++++++++++---------------- tools/efrotools/pcommand.py | 8 +++----- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index 4d79017e..f071c12e 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4076,18 +4076,18 @@ "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "7b5a0ecb206e6e99bc226b450947f574", "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "3ec06df77ccbd6692f70627590839015", "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "6d0aaabc7b99cc3ede5e929243978996", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "631d5a2204d5d3634fc1bdd46c796859", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "33999dcb4a63b567a0949b4f7ecc54cf", "build/prefab/full/mac_arm64_gui/release/ballisticakit": "3ccba6e3f58feaa072e586a931e4fd66", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "96eb56cd505e0f92f458b87eb75a6302", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "deeee7e99b1567ef45823dcf29dbb100", "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "98a5504c530c7e7332c7a36e74768cda", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "bc0908db33b5f6050b7c3b4c8b2417e7", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "019b32405e75d53e067905b3f51cd3b9", "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "2de6690d43b4e0ca1f025db203e61105", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "f74eb8cb8da7c495c8819fcada00a121", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "7f42852086008f2002ccca42c6168abf", "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "f5931ba9f402cb06ae3fac1435fe373b", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "976ae922d494e46c4a4fd02ff7865ee2", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "7c15a5bf7143643e8bc323ab089fd39c", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "54b323cff3667c4709a16e9bf59c486e", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "fa126d2933b6de248ce5106a4c1cf352", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "374a00328f34e8e74b403bd9fbd06de7", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "cff07c3e67e2464f3c44d0569be2b5d9", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "e1cc959ab6bcb1d08d1aaee66e4d1954", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "665a857996aa66f219bfd3e952273548", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "85ba4e81a1f7ae2cff4b1355eb49904f", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "498921f7eb2afd327d4b900cb70e31f9", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "85ba4e81a1f7ae2cff4b1355eb49904f", @@ -4104,14 +4104,14 @@ "build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "0ab638b6602610bdaf432e3cc2464080", "build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "92394eb19387c363471ce134ac9e6a1b", "build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "0ab638b6602610bdaf432e3cc2464080", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "2230deabd9849040e6b1b92731d7822a", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "2ab64a005028544389a156a74166088d", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "947ab9ba065585adcf833ac12c2d2ccc", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "e7d9e4e882e2e7cfd9409b9f206d5aeb", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "e380c91edef718832d66268e2a0c40da", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "7d089bfc30283c1f5e1900558e5570e0", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "0613a4fae464d56c6eb266ca34a83ffd", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "feee93b89b847c1d9024d6ee80e885d9", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "751b37596fee680fd2e3d3970f143f08", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "10992719c7c52ab66a4619f3f6b11d0a", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "45cdf0ab9ee98fcac751f32de58db6e6", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "9619372dfc00dba3dbf40b3467e79315", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "029b19cb1f4eec2b6d18a5f1e18f3c1a", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "028fe65945120f39f1548769f6325ba6", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "eaa50ec9e58920c7a8fccb992b5adc1c", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "c964421089cf8ad65bb20c7b85ad917c", "src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c", "src/assets/ba_data/python/babase/_mgen/enums.py": "f8cd3af311ac63147882590123b78318", "src/ballistica/base/mgen/pyembed/binding_base.inc": "eeddad968b176000e31c65be6206a2bc", diff --git a/tools/efrotools/pcommand.py b/tools/efrotools/pcommand.py index 8357f7ac..078e1ceb 100644 --- a/tools/efrotools/pcommand.py +++ b/tools/efrotools/pcommand.py @@ -212,8 +212,6 @@ def run_client_pcommand(args: list[str], isatty: bool) -> tuple[int, str]: # Clear any output from previous commands on this thread. if hasattr(_g_thread_local_storage, 'output'): delattr(_g_thread_local_storage, 'output') - if hasattr(_g_thread_local_storage, 'output'): - delattr(_g_thread_local_storage, 'output') # Stuff args into our thread-local storage so the user can get at # them. @@ -229,8 +227,8 @@ def run_client_pcommand(args: list[str], isatty: bool) -> tuple[int, str]: raise RuntimeError(f'client pcommand returned error code {resultcode}.') output = getattr(_g_thread_local_storage, 'output', '') - assert isinstance(output, str) + return (resultcode, output) @@ -253,8 +251,8 @@ def _trim_docstring(docstring: str) -> str: if not docstring: return '' - # Convert tabs to spaces (following the normal Python rules) - # and split into a list of lines. + # Convert tabs to spaces (following the normal Python rules) and + # split into a list of lines. lines = docstring.expandtabs().splitlines() # Determine minimum indentation (first line doesn't count).