Skip to content

Commit

Permalink
Merge a2b8384 into f9e8249
Browse files Browse the repository at this point in the history
  • Loading branch information
olgashtivelman committed Aug 13, 2018
2 parents f9e8249 + a2b8384 commit 1d43448
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions remote/mounter/scbe.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"github.com/IBM/ubiquity/resources"
"github.com/IBM/ubiquity/utils"
"github.com/IBM/ubiquity/utils/logs"
"os"
)

type scbeMounter struct {
Expand Down Expand Up @@ -121,6 +122,10 @@ func (s *scbeMounter) Unmount(unmountRequest resources.UnmountRequest) error {
if err := s.exec.RemoveAll(mountpoint); err != nil { // TODO its enough to do Remove without All.
return s.logger.ErrorRet(err, "RemoveAll failed", logs.Args{{"mountpoint", mountpoint}})
}
} else{
if os.IsNotExist(err){
s.logger.Warning("Idempotent issue encountered: mountpoint directory does not exist.", logs.Args{{"mountpoint", mountpoint}})
}
}

return nil
Expand Down

0 comments on commit 1d43448

Please sign in to comment.