pesde-pkg/pesde
1
1
Fork 0
mirror of https://github.com/pesde-pkg/pesde.git synced 2025-04-04 10:50:55 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix: refresh sources before reading from them

Browse source 
Previously, if a package was modified in a way
that the index hasn't been cloned (for example,
through a remote Git change) pesde would be unable
to read the package's metadata, whether it be
because the index was outdated or because it
wasn't cloned at all. These are now refreshed
as needed like everywhere else.
This commit is contained in:
daimond113 2025-02-08 14:03:43 +01:00
parent 399c63cc8c
commit 1a79326ebf
No known key found for this signature in database
GPG key ID: 640DC95EC1190354
2 changed files with 42 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased]
### Fixed
- Refresh sources before reading package data to ensure the index is even cloned (remote changes to lockfile) by @daimond113
## [0.6.0-rc.3] - 2025-02-08
### Fixed
- Fix `self-upgrade` using the wrong path when doing a fresh download by @daimond113

42
src/cli/install.rs
View file

@ -16,7 +16,12 @@ use pesde::{
lockfile::Lockfile,
manifest::{target::TargetKind, Alias, DependencyType, Manifest},
names::PackageNames,
source::{pesde::PesdePackageSource, refs::PackageRefs, traits::PackageRef, PackageSources},
source::{
pesde::PesdePackageSource,
refs::PackageRefs,
traits::{PackageRef, RefreshOptions},
PackageSources,
},
version_matches, Project, RefreshedSources, LOCKFILE_FILE_NAME, MANIFEST_FILE_NAME,
};
use std::{
@ -241,9 +246,23 @@ pub async fn install(
panic!("unexpected package name");
};
let project = project.clone();
let refreshed_sources = refreshed_sources.clone();
Some(async move {
let file = source.read_index_file(&name, &project).await.context("failed to read package index file")?.context("package not found in index")?;
refreshed_sources
.refresh(
&PackageSources::Pesde(source.clone()),
&RefreshOptions {
project: project.clone(),
},
)
.await
.context("failed to refresh source")?;
let file = source.read_index_file(&name, &project)
.await
.context("failed to read package index file")?
.context("package not found in index")?;
Ok::<_, anyhow::Error>(if file.meta.deprecated.is_empty() {
None
@ -288,7 +307,7 @@ pub async fn install(
reporter,
)
.hooks(hooks)
.refreshed_sources(refreshed_sources)
.refreshed_sources(refreshed_sources.clone())
.prod(options.prod)
.network_concurrency(options.network_concurrency)
.force(options.force || has_irrecoverable_changes),
@ -339,17 +358,32 @@ pub async fn install(
let id = id.clone();
let node = node.clone();
let project = project.clone();
let refreshed_sources = refreshed_sources.clone();
async move {
let engines = match &node.node.pkg_ref {
PackageRefs::Pesde(pkg_ref) => {
let source = PesdePackageSource::new(pkg_ref.index_url.clone());
refreshed_sources
.refresh(
&PackageSources::Pesde(source.clone()),
&RefreshOptions {
project: project.clone(),
},
)
.await
.context("failed to refresh source")?;
#[allow(irrefutable_let_patterns)]
let PackageNames::Pesde(name) = id.name() else {
panic!("unexpected package name");
};
let mut file = source.read_index_file(name, &project).await.context("failed to read package index file")?.context("package not found in index")?;
let mut file = source.read_index_file(name, &project)
.await
.context("failed to read package index file")?
.context("package not found in index")?;
file
.entries
.remove(id.version_id())