Skip to content

Commit e47663c

Browse files
committed
Fix composer vendor build after #300 squash
The #300 squash kept both Composer file-inventory fixes: one before the lock rewrite and one after the marker write. The second rebound an already-moved value, so socket-patch-core failed to compile and every Rust CI job went red. Keep the pre-rewrite inventory. It runs after filter normalization, and a failure there refuses before composer.lock is touched. The marker lives in the uuid dir, outside the inventoried copy, so the result is the same. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01F3KCWT9B1MUVPrgerxxGpK Assisted-by: Claude Code:claude-opus-5-5
1 parent 40957fb commit e47663c

1 file changed

Lines changed: 1 addition & 11 deletions

File tree

‎crates/socket-patch-core/src/vendor/composer_lock.rs‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -440,16 +440,7 @@ pub async fn vendor_composer<'a>(
440440
let marker = VendorMarker::new("composer", &base_purl, record, vendored_at);
441441
write_marker_or_warn(&uuid_dir, &marker, &mut warnings).await;
442442

443-
let file_inventory = match super::verify::compute_dir_inventory(&copy_dir).await {
444-
Ok(inventory) => inventory,
445-
Err(error) => {
446-
let _ = remove_tree(&uuid_dir).await;
447-
prune_empty_vendor_dirs(&copy_dir).await;
448-
return refused("vendor_inventory_unavailable", error);
449-
}
450-
};
451-
452-
let mut entry = VendorEntry {
443+
let entry = VendorEntry {
453444
ecosystem: "composer".to_string(),
454445
base_purl,
455446
uuid: record.uuid.clone(),
@@ -480,7 +471,6 @@ pub async fn vendor_composer<'a>(
480471
pdm: None,
481472
pipenv: None,
482473
};
483-
entry.artifact.file_inventory = Some(file_inventory);
484474

485475
done(result, Some(entry), warnings)
486476
}

0 commit comments

Comments
 (0)