fix: remove conflicting pool files before publishing

When packages are rebuilt with the same version but different content,
aptly fails to publish with "file already exists and is different" error.

Fix: Before publishing, scan snapshots for packages and remove any
existing pool files that match. This is safe because aptly will re-link
the correct files during publish.

This handles the case where:
1. Package v1 was built and published (pool has file A)
2. Package v1 was rebuilt with different content (isolated pool has file B)
3. Merge imports file B to main pool
4. Publish tries to link file B but file A already exists -> ERROR

Now we remove file A before publishing, so file B can be linked cleanly.

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

Author: igorpecovnik

tools/repository/repo.sh

@@ -935,6 +935,25 @@ merge_repos() {
 
 		# Publish with common component included
 		log "Publishing $release with component list: $component_list"
+
+		# Before publishing, clean up any conflicting files in the pool
+		# This can happen when packages are rebuilt with same version but different content
+		local published_pool="${output_folder}/public/pool"
+		if [[ -d "$published_pool" ]]; then
+			log "Checking for conflicting pool files..."
+			# Get list of packages that will be published and remove existing pool files
+			# This is safe because aptly will re-link them during publish
+			for snapshot in $snapshot_list; do
+				aptly -config="$main_db_config" snapshot show "$snapshot" 2>/dev/null | grep -E "^\s+[a-z0-9]+:" | while read -r pkg_line; do
+					# Parse package line: name_version_arch
+					pkg_line=$(echo "$pkg_line" | xargs) # trim whitespace
+					local pkg_name=$(echo "$pkg_line" | cut -d_ -f1)
+					# Find and remove any existing pool files for this package
+					find "$published_pool" -name "${pkg_name}_*.deb" -type f -delete 2>/dev/null || true
+				done
+			done
+		fi
+
 		if ! run_aptly publish \
 			-skip-signing \
 			-skip-contents \