Initial

Author: wirwolf

salt_bundle/release.py

@@ -1,5 +1,6 @@
 """Release automation: detect, pack and publish formulas."""
 
+import os
 import shutil
 import subprocess
 from datetime import datetime
@@ -234,6 +235,15 @@ def commit_index_to_branch(
         )
         current_branch = result.stdout.strip()
 
+        # Temporarily move index.yaml to avoid conflicts during checkout
+        temp_index = None
+        branch_index = repo_dir / 'index.yaml'
+        if branch_index.exists() and index_file.resolve() == branch_index.resolve():
+            import tempfile
+            temp_dir = Path(tempfile.gettempdir())
+            temp_index = temp_dir / f'index.yaml.tmp.{os.getpid()}'
+            shutil.move(str(branch_index), str(temp_index))
+
         # Check if target branch exists remotely
         result = subprocess.run(
             ['git', 'ls-remote', '--heads', 'origin', branch_name],
@@ -290,12 +300,10 @@ def commit_index_to_branch(
                 check=False
             )
 
-        # Copy index.yaml to branch root
-        import shutil
-        branch_index = repo_dir / 'index.yaml'
-
-        # Only copy if source and destination are different
-        if index_file.resolve() != branch_index.resolve():
+        # Restore index.yaml from temp location or copy from source
+        if temp_index and temp_index.exists():
+            shutil.move(str(temp_index), str(branch_index))
+        elif index_file.resolve() != branch_index.resolve():
             shutil.copy2(index_file, branch_index)
 
         # Add index.yaml
@@ -355,8 +363,20 @@ def commit_index_to_branch(
             )
         except:
             pass
+        # Restore temp index if exists
+        if temp_index and temp_index.exists():
+            try:
+                shutil.move(str(temp_index), str(repo_dir / 'index.yaml'))
+            except:
+                pass
         return False, f"Failed to commit index: {e.stderr}"
     except FileNotFoundError:
+        # Restore temp index if exists
+        if temp_index and temp_index.exists():
+            try:
+                shutil.move(str(temp_index), str(repo_dir / 'index.yaml'))
+            except:
+                pass
         return False, "Git not found"