iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up both VHD and regular temp dir

This commit is contained in:
Sander Saares 2017-08-01 12:48:17 +03:00
parent 028c941b77
commit 2a1a9a55f8
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
builder/hyperv/common/step_create_tempdir.go
View File

@ -10,9 +10,12 @@ import (
) )
type StepCreateTempDir struct { type StepCreateTempDir struct {
// The user-supplied root directores into which we create subdirectories.
TempPath string TempPath string
VhdTempPath string VhdTempPath string
// The subdirectories with the randomly generated name.
dirPath string dirPath string
vhdDirPath string
} }
func (s *StepCreateTempDir) Run(state multistep.StateBag) multistep.StepAction { func (s *StepCreateTempDir) Run(state multistep.StateBag) multistep.StepAction {
@ -47,7 +50,7 @@ func (s *StepCreateTempDir) Run(state multistep.StateBag) multistep.StepAction {
return multistep.ActionHalt return multistep.ActionHalt
} }
s.dirPath = packerVhdTempDir s.vhdDirPath = packerVhdTempDir
state.Put("packerVhdTempDir", packerVhdTempDir) state.Put("packerVhdTempDir", packerVhdTempDir)
} }
@ -57,12 +60,9 @@ func (s *StepCreateTempDir) Run(state multistep.StateBag) multistep.StepAction {
} }
func (s *StepCreateTempDir) Cleanup(state multistep.StateBag) { func (s *StepCreateTempDir) Cleanup(state multistep.StateBag) {
if s.dirPath == "" {
return
}
ui := state.Get("ui").(packer.Ui) ui := state.Get("ui").(packer.Ui)
if s.dirPath != "" {
ui.Say("Deleting temporary directory...") ui.Say("Deleting temporary directory...")
err := os.RemoveAll(s.dirPath) err := os.RemoveAll(s.dirPath)
@ -71,3 +71,14 @@ func (s *StepCreateTempDir) Cleanup(state multistep.StateBag) {
ui.Error(fmt.Sprintf("Error deleting temporary directory: %s", err)) ui.Error(fmt.Sprintf("Error deleting temporary directory: %s", err))
} }
} }
if s.vhdDirPath != "" && s.dirPath != s.vhdDirPath {
ui.Say("Deleting temporary VHD directory...")
err := os.RemoveAll(s.vhdDirPath)
if err != nil {
ui.Error(fmt.Sprintf("Error deleting temporary VHD directory: %s", err))
}
}
}