diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index e6049ddef..700d0256d 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -1,7 +1,7 @@ { "ImportPath": "github.com/mitchellh/packer", "GoVersion": "go1.6", - "GodepVersion": "v63", + "GodepVersion": "v62", "Deps": [ { "ImportPath": "github.com/ActiveState/tail", diff --git a/vendor/github.com/packer-community/winrmcp/winrmcp/cp.go b/vendor/github.com/packer-community/winrmcp/winrmcp/cp.go index e36642e25..1065e4529 100644 --- a/vendor/github.com/packer-community/winrmcp/winrmcp/cp.go +++ b/vendor/github.com/packer-community/winrmcp/winrmcp/cp.go @@ -10,21 +10,18 @@ import ( "sync" "github.com/masterzen/winrm/winrm" - "github.com/nu7hatch/gouuid" + "github.com/mitchellh/packer/common/uuid" ) func doCopy(client *winrm.Client, config *Config, in io.Reader, toPath string) error { - tempFile, err := tempFileName() - if err != nil { - return errors.New(fmt.Sprintf("Error generating unique filename: %v", err)) - } + tempFile := fmt.Sprintf("winrmcp-%s.tmp", uuid.TimeOrderedUUID()) tempPath := "$env:TEMP\\" + tempFile if os.Getenv("WINRMCP_DEBUG") != "" { log.Printf("Copying file to %s\n", tempPath) } - err = uploadContent(client, config.MaxOperationsPerShell, "%TEMP%\\"+tempFile, in) + err := uploadContent(client, config.MaxOperationsPerShell, "%TEMP%\\"+tempFile, in) if err != nil { return errors.New(fmt.Sprintf("Error uploading file to %s: %v", tempPath, err)) } @@ -116,7 +113,7 @@ func restoreContent(client *winrm.Client, fromPath, toPath string) error { defer shell.Close() script := fmt.Sprintf(` $tmp_file_path = [System.IO.Path]::GetFullPath("%s") - $dest_file_path = [System.IO.Path]::GetFullPath("%s".Trim("'")) + $dest_file_path = [System.IO.Path]::GetFullPath("%s") if (Test-Path $dest_file_path) { rm $dest_file_path } @@ -201,12 +198,3 @@ func appendContent(shell *winrm.Shell, filePath, content string) error { return nil } - -func tempFileName() (string, error) { - uniquePart, err := uuid.NewV4() - if err != nil { - return "", err - } - - return fmt.Sprintf("winrmcp-%s.tmp", uniquePart), nil -} diff --git a/vendor/github.com/packer-community/winrmcp/winrmcp/winrmcp.go b/vendor/github.com/packer-community/winrmcp/winrmcp/winrmcp.go index a11ecd180..d41061b4b 100644 --- a/vendor/github.com/packer-community/winrmcp/winrmcp/winrmcp.go +++ b/vendor/github.com/packer-community/winrmcp/winrmcp/winrmcp.go @@ -42,12 +42,7 @@ func New(addr string, config *Config) (*Winrmcp, error) { config = &Config{} } - params := winrm.NewParameters( - winrm.DefaultParameters.Timeout, - winrm.DefaultParameters.Locale, - winrm.DefaultParameters.EnvelopeSize, - ) - + params := winrm.DefaultParameters() if config.TransportDecorator != nil { params.TransportDecorator = config.TransportDecorator }