2

Modified:
  • src/omnipkg/dispatcher.py (+32/-12 lines)

[gitship-generated]

Author: 1minds3t

src/omnipkg/dispatcher.py

@@ -575,13 +575,14 @@ def _install_binary_into_bin_dir(binary_tmp, target_bin, src_hash: str, debug: b
     target_bin = Path(target_bin)
 
     _exe = ".exe" if sys.platform == "win32" else ""
-    all_succeeded = True  # <-- NEW: Track if all binaries successfully update
+    all_succeeded = True  # Track if all binaries successfully updated
+    any_hard_failed = False  # True only for failures that aren't "file in use"
 
     for name in ("8pkg", "omnipkg", "OMNIPKG", "8PKG"):
         target = target_bin / (name + _exe)
         if target.exists():
             try:
-                # NEW: Windows file lock bypass: Rename the running executable first
+                # Windows file lock bypass: Rename the running executable first
                 if sys.platform == "win32":
                     old_target = target.with_name(target.name + ".old")
                     try:
@@ -590,18 +591,31 @@ def _install_binary_into_bin_dir(binary_tmp, target_bin, src_hash: str, debug: b
                         target.rename(old_target)
                     except Exception:
                         pass
-                
+
                 shutil.copy2(str(binary_tmp), str(target))
                 if sys.platform != "win32":
                     os.chmod(str(target), 0o755)
                 replaced.append(str(target))
             except Exception as e:
-                all_succeeded = False  # <-- NEW: Mark as failed!
+                all_succeeded = False
+                # WinError 32 = file in use = the process is currently running
+                # from this exe. That's expected and harmless — the .old rename
+                # trick means the next cold-start will pick up the new binary.
+                # Don't treat this as a hard failure that blocks the marker write.
+                is_file_in_use = (
+                    sys.platform == "win32"
+                    and hasattr(e, "winerror")
+                    and e.winerror == 32
+                )
+                if not is_file_in_use:
+                    any_hard_failed = True
                 if debug:
                     print(f"[C-INSTALL] could not replace {target}: {e}", file=sys.stderr)
 
-    # NEW: ONLY write the marker if every replacement succeeded
-    if replaced and all_succeeded and src_hash and c_src:
+    # Write the marker as long as we replaced at least one binary and had no
+    # hard failures. WinError 32 (file-in-use on the running exe) is not a
+    # hard failure — it's expected and already handled by the .old rename.
+    if replaced and not any_hard_failed and src_hash and c_src:
         try:
             (target_bin / ".omnipkg_dispatch_compiled").write_text(
                 f"{src_hash}:{c_src}", encoding="utf-8"
@@ -649,15 +663,15 @@ def _push_binary_to_bin_dir(native_bin, target_bin, src_hash: str, debug: bool)
     if debug:
         print(f"[C-INSTALL] push: {src_binary} -> {target_bin}", file=sys.stderr)
 
-    replaced =[]
+    replaced = []
     _exe = ".exe" if sys.platform == "win32" else ""
-    all_succeeded = True  # <-- NEW
-    
+    any_hard_failed = False
+
     for name in ("8pkg", "omnipkg", "OMNIPKG", "8PKG"):
         target = target_bin / (name + _exe)
         if target.exists():
             try:
-                # NEW: Windows rename trick
+                # Windows rename trick
                 if sys.platform == "win32":
                     old_target = target.with_name(target.name + ".old")
                     try:
@@ -675,11 +689,17 @@ def _push_binary_to_bin_dir(native_bin, target_bin, src_hash: str, debug: bool)
                     os.chmod(str(target), 0o755)
                 replaced.append(name)
             except Exception as e:
-                all_succeeded = False  # <-- NEW
+                is_file_in_use = (
+                    sys.platform == "win32"
+                    and hasattr(e, "winerror")
+                    and e.winerror == 32
+                )
+                if not is_file_in_use:
+                    any_hard_failed = True
                 if debug:
                     print(f"[C-INSTALL] push: could not replace {target}: {e}", file=sys.stderr)
 
-    if replaced and all_succeeded and src_hash:
+    if replaced and not any_hard_failed and src_hash:
         try:
             (target_bin / ".omnipkg_dispatch_compiled").write_text(src_hash, encoding="utf-8")
             if debug: