0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #33944 from cpuguy83/fix_wrong_dirname

Browse source 
Fix plugin remove dir name after rename.
This commit is contained in:
Victor Vieux 2017-07-04 16:12:39 +02:00 • committed by GitHub
commit 82c2a08b60
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
plugin/backend_linux.go
View file

@ -630,11 +630,12 @@ func (pm *Manager) Remove(name string, config *types.PluginRmConfig) error {
return errors.Wrap(err, "error unmounting plugin data")
}
if err := os.Rename(pluginDir, pluginDir+"-removing"); err != nil {
removeDir := pluginDir + "-removing"
if err := os.Rename(pluginDir, removeDir); err != nil {
return errors.Wrap(err, "error performing atomic remove of plugin dir")
}
if err := system.EnsureRemoveAll(pluginDir); err != nil {
if err := system.EnsureRemoveAll(removeDir); err != nil {
return errors.Wrap(err, "error removing plugin dir")
}
pm.config.Store.Remove(p)