Skip to content

Ensure lock is applied when BuildPlan validation would require changes #2090

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 23, 2022
Merged

Ensure lock is applied when BuildPlan validation would require changes #2090

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions forc-pkg/src/pkg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,12 +263,6 @@ impl BuildPlan {
// If there are errors we will need to create the BuildPlan from scratch, i.e fetch & pin everything
let mut new_lock_cause = None;
let mut plan = plan_result.or_else(|e| -> Result<BuildPlan> {
if locked {
bail!(
"The lock file {} needs to be updated but --locked was passed to prevent this.",
lock_path.to_string_lossy()
);
}
new_lock_cause = if e.to_string().contains("No such file or directory") {
Some(anyhow!("lock file did not exist"))
} else {
Expand All @@ -289,6 +283,15 @@ impl BuildPlan {
}

if let Some(cause) = new_lock_cause {
if locked {
bail!(
"The lock file {} needs to be updated (Cause: {}) \
but --locked was passed to prevent this.",
lock_path.to_string_lossy(),
cause,
);
}

info!(" Creating a new `Forc.lock` file. (Cause: {})", cause);
create_new_lock(&plan, &old_lock, manifest, &lock_path)?;
info!(" Created new lock file at {}", lock_path.display());
Expand Down