Wavyzz/docker-volume-backup
2
0
Fork 0
mirror of https://github.com/offen/docker-volume-backup.git synced 2026-04-22 16:42:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Do not accidentally nil out errors

Browse Source
This commit is contained in:
Frederik Ring
2024-02-07 21:01:13 +01:00
parent 749ca85db9
commit cb31554791
3 changed files with 50 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/backup/exec.go
View File

@@ -188,13 +188,18 @@ func (s *script) withLabeledCommands(step lifecyclePhase, cb func() error) func(
if s.cli == nil {
return cb
}
return func() (ret error) {
if err := s.runLabeledCommands(fmt.Sprintf("docker-volume-backup.%s-pre", step)); err != nil {
return fmt.Errorf("withLabeledCommands: %s: error running pre commands: %w", step, err)
return func() (err error) {
if err = s.runLabeledCommands(fmt.Sprintf("docker-volume-backup.%s-pre", step)); err != nil {
err = fmt.Errorf("withLabeledCommands: %s: error running pre commands: %w", step, err)
return
}
defer func() {
ret = s.runLabeledCommands(fmt.Sprintf("docker-volume-backup.%s-post", step))
derr := s.runLabeledCommands(fmt.Sprintf("docker-volume-backup.%s-post", step))
if err == nil && derr != nil {
err = derr
}
}()
return cb()
err = cb()
return
}
}