Merge pull request #1501 from JessThrysoee/current_fdd0_does_not_exist

builder/parallels: Ignore 'The fdd0 device does not exist'

Merge pull request #1501 from JessThrysoee/current_fdd0_does_not_exist
builder/parallels: Ignore 'The fdd0 device does not exist'
57ad64da · Rickard von Essen · dc3f156f · cf6532ff · 57ad64da
Commit 57ad64da authored Oct 04, 2014 by Rickard von Essen
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

builder/parallels/common/step_attach_floppy.go builder/parallels/common/step_attach_floppy.go +3 -4

No files found.
--- a/builder/parallels/common/step_attach_floppy.go
+++ b/builder/parallels/common/step_attach_floppy.go
@@ -39,11 +39,10 @@ func (s *StepAttachFloppy) Run(state multistep.StateBag) multistep.StepAction {
 		"set", vmName,
 		"--device-del", "fdd0",
 	}
-	if err := driver.Prlctl(del_command...); err != nil {
+	// This will almost certainly fail with 'The fdd0 device does not exist.'
-		state.Put("error", fmt.Errorf("Error deleting floppy: %s", err))
+	driver.Prlctl(del_command...)
-	}
-	ui.Say("Attaching floppy disk...")
+	ui.Say("Attaching floppy disk...")
 	// Attaching the floppy disk
 	add_command := []string{
 		"set", vmName,