kjuulh/dagger
Archived
1
0
Fork 0
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

mod: defer Unlock to avoid deadlocks in the pkg manager

Browse Source 
Signed-off-by: Sam Alba <samalba@users.noreply.github.com>
This commit is contained in:
Sam Alba 2021-11-08 17:29:33 -08:00
parent 6acc7e2c4d
commit 1dd538e729
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mod/mod.go
View File

@ -41,6 +41,8 @@ func Install(ctx context.Context, workspace, repoName, versionConstraint string)
return nil, err return nil, err
} }
defer fileLock.Unlock()
err = modfile.install(ctx, require) err = modfile.install(ctx, require)
if err != nil { if err != nil {
return nil, err return nil, err
@ -50,10 +52,6 @@ func Install(ctx context.Context, workspace, repoName, versionConstraint string)
return nil, err return nil, err
} }
if err := fileLock.Unlock(); err != nil {
return nil, err
}
return require, nil return require, nil
} }
@ -98,6 +96,8 @@ func Update(ctx context.Context, workspace, repoName, versionConstraint string)
return nil, err return nil, err
} }
defer fileLock.Unlock()
updatedRequire, err := modfile.updateToLatest(ctx, require) updatedRequire, err := modfile.updateToLatest(ctx, require)
if err != nil { if err != nil {
return nil, err return nil, err
@ -107,10 +107,6 @@ func Update(ctx context.Context, workspace, repoName, versionConstraint string)
return nil, err return nil, err
} }
if err := fileLock.Unlock(); err != nil {
return nil, err
}
return updatedRequire, nil return updatedRequire, nil
} }