erabo/spiegel_podman
1
0
Fork 0
mirror of https://github.com/podman-container-tools/podman.git synced 2026-08-05 00:15:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

make return explicit so CleanIfErr runs as expectd

Browse source 
Signed-off-by: Jait Jacob <jai8.jacob@gmail.com>
This commit is contained in:
Jait Jacob 2026-07-21 23:30:29 +05:30
parent 2ad3a79631
commit eb26516dba
No known key found for this signature in database
GPG key ID: 10414D17D526AA85
1 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
pkg/machine/shim/host.go
View file

@ -439,23 +439,29 @@ func StopThenStart(mc *vmconfigs.MachineConfig, mp vmconfigs.VMProvider, hardSto
}
mc.Lock()
defer mc.Unlock()
if err := mc.Refresh(); err != nil {
return fmt.Errorf("reload config: %w", err)
}
if err := stopLocked(mc, mp, dirs, hardStop); err != nil {
err = mc.Refresh()
if err != nil {
err = fmt.Errorf("reload config: %w", err)
return err
}
if err := mc.Refresh(); err != nil {
return fmt.Errorf("reload config: %w", err)
err = stopLocked(mc, mp, dirs, hardStop)
if err != nil {
return err
}
err = mc.Refresh()
if err != nil {
err = fmt.Errorf("reload config: %w", err)
return err
}
callbackFuncs := machine.CleanUp()
defer callbackFuncs.CleanIfErr(&err)
go callbackFuncs.CleanOnSignal(opts.Quiet)
return startLocked(mc, mp, dirs, opts, updateSystemConn, &callbackFuncs)
err = startLocked(mc, mp, dirs, opts, updateSystemConn, &callbackFuncs)
return err
}
// stopLocked stops the machine and expects the caller to hold the machine's lock.
@ -537,11 +543,14 @@ func Start(mc *vmconfigs.MachineConfig, mp vmconfigs.VMProvider, opts machine.St
defer func() { _ = mcunlock() }()
}
if err = mc.Refresh(); err != nil {
return fmt.Errorf("reload config: %w", err)
err = mc.Refresh()
if err != nil {
err = fmt.Errorf("reload config: %w", err)
return err
}
return startLocked(mc, mp, dirs, opts, updateSystemConn, &callbackFuncs)
err = startLocked(mc, mp, dirs, opts, updateSystemConn, &callbackFuncs)
return err
}
// startLocked starts the machine and expects the caller to hold the machine's lock.