External/pmg
1
0
Fork 0
mirror of https://github.com/safedep/pmg.git synced 2026-08-03 07:24:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: Merge conflicts

Browse Source
This commit is contained in:
Abhisek Datta
2026-01-12 12:34:57 +05:30
parent 51c68c4cc4
commit d48ba68847
3 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sandbox/executor/apply.go
+4 -4
View File
@@ -34,15 +34,15 @@ func WithSandbox(sb sandbox.Sandbox) applySandboxOpt {
func ApplySandbox(ctx context.Context, cmd *exec.Cmd, pmName string, opts ...applySandboxOpt) (*sandbox.ExecutionResult, error) {
cfg := config.Get()
if !cfg.Config.Sandbox.Enabled {
return sandbox.NewExecutionResult(), nil
}
applyConfig := &applySandboxConfig{}
for _, opt := range opts {
opt(applyConfig)
}
if !cfg.Config.Sandbox.Enabled {
return sandbox.NewExecutionResult(), nil
}
registry, err := sandbox.NewProfileRegistry()
if err != nil {
return nil, fmt.Errorf("failed to create profile registry: %w", err)