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

fix null file descriptor error

This commit is contained in:
Megan Marsh 2019-05-30 15:34:18 -05:00
parent 078622a40d
commit 4bf75ac0f3
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
provisioner/powershell/provisioner.go
View File

@ -9,6 +9,7 @@ import (
"fmt" "fmt"
"log" "log"
"os" "os"
"path/filepath"
"sort" "sort"
"strings" "strings"
"time" "time"
@ -252,6 +253,14 @@ func (p *Provisioner) Provision(ctx context.Context, ui packer.Ui, comm packer.C
ui.Say(fmt.Sprintf("Provisioning with powershell script: %s", path)) ui.Say(fmt.Sprintf("Provisioning with powershell script: %s", path))
log.Printf("Opening %s for reading", path) log.Printf("Opening %s for reading", path)
fi, err := os.Stat(path)
if err != nil {
return fmt.Errorf("Error stating powershell script: %s", err)
}
if strings.HasSuffix(p.config.RemotePath, `\`) {
// path is a directory
p.config.RemotePath += filepath.Base((fi).Name())
}
f, err := os.Open(path) f, err := os.Open(path)
if err != nil { if err != nil {
return fmt.Errorf("Error opening powershell script: %s", err) return fmt.Errorf("Error opening powershell script: %s", err)
@ -272,7 +281,7 @@ func (p *Provisioner) Provision(ctx context.Context, ui packer.Ui, comm packer.C
if _, err := f.Seek(0, 0); err != nil { if _, err := f.Seek(0, 0); err != nil {
return err return err
} }
if err := comm.Upload(p.config.RemotePath, f, nil); err != nil { if err := comm.Upload(p.config.RemotePath, f, &fi); err != nil {
return fmt.Errorf("Error uploading script: %s", err) return fmt.Errorf("Error uploading script: %s", err)
} }