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

common/config,download: gofmt fixes

This commit is contained in:
Jason A. Beranek 2013-08-02 16:06:06 -05:00
parent 760f102c91
commit 3fa5fa396a
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/config.go
View File

@ -7,7 +7,7 @@ import (
"net/url" "net/url"
"os" "os"
"path/filepath" "path/filepath"
"runtime" "runtime"
"sort" "sort"
"strings" "strings"
) )
@ -74,11 +74,11 @@ func DownloadableURL(original string) (string, error) {
} }
if url.Scheme == "file" { if url.Scheme == "file" {
// For Windows absolute file paths, remove leading / // For Windows absolute file paths, remove leading /
// prior to processing // prior to processing
if runtime.GOOS == "windows" && url.Path[0] == '/' { if runtime.GOOS == "windows" && url.Path[0] == '/' {
url.Path = url.Path[1:len(url.Path)] url.Path = url.Path[1:len(url.Path)]
} }
if _, err := os.Stat(url.Path); err != nil { if _, err := os.Stat(url.Path); err != nil {
return "", err return "", err

14
common/download.go
View File

@ -14,7 +14,7 @@ import (
"net/http" "net/http"
"net/url" "net/url"
"os" "os"
"runtime" "runtime"
) )
// DownloadConfig is the configuration given to instantiate a new // DownloadConfig is the configuration given to instantiate a new
@ -107,13 +107,13 @@ func (d *DownloadClient) Get() (string, error) {
// Files when we don't copy the file are special cased. // Files when we don't copy the file are special cased.
var finalPath string var finalPath string
if url.Scheme == "file" && !d.config.CopyFile { if url.Scheme == "file" && !d.config.CopyFile {
// Remove forward slash on absolute Windows file URLs // Remove forward slash on absolute Windows file URLs
// Before processing // Before processing
if runtime.GOOS == "windows" && url.Path[0] == '/' { if runtime.GOOS == "windows" && url.Path[0] == '/' {
finalPath = url.Path[1:len(url.Path)] finalPath = url.Path[1:len(url.Path)]
} else { } else {
finalPath = url.Path finalPath = url.Path
} }
} else { } else {
finalPath = d.config.TargetPath finalPath = d.config.TargetPath