qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-19 14:54:43 -07:00
Code Releases Activity

goinstall: s/vlogf/printf/

Browse Source 
R=golang-dev, dsymonds
CC=golang-dev
https://golang.org/cl/4628050
This commit is contained in:
Andrew Gerrand 2011-06-20 14:44:14 +10:00
parent e068b85bea
commit f3a7dad654
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cmd/goinstall/download.go
View File

@ -173,7 +173,7 @@ func tryCommand(c chan *vcsMatch, v *vcs, prefixes []string) {
for _, prefix := range prefixes {
for _, suffix := range suffixes {
repo := proto + "://" + prefix + suffix
vlogf("try: %s %s %s\n", v.cmd, v.check, repo)
printf("try: %s %s %s\n", v.cmd, v.check, repo)
if exec.Command(v.cmd, v.check, repo).Run() == nil {
c <- &vcsMatch{v, prefix, repo}
return

16
src/cmd/goinstall/main.go
View File

@ -57,7 +57,7 @@ func logf(format string, args ...interface{}) {
fmt.Fprintf(os.Stderr, format, args...)
}
func vlogf(format string, args ...interface{}) {
func printf(format string, args ...interface{}) {
if *verbose {
logf(format, args...)
}
@ -175,14 +175,14 @@ func install(pkg, parent string) (built bool) {
if parent == "" {
errorf("%s: can not goinstall the standard library\n", pkg)
} else {
vlogf("%s: skipping standard library\n", pkg)
printf("%s: skipping standard library\n", pkg)
}
return
}
// Download remote packages if not found or forced with -u flag.
remote := isRemote(pkg)
if remote && (err == build.ErrNotFound || (err == nil && *update)) {
vlogf("%s: download\n", pkg)
printf("%s: download\n", pkg)
err = download(pkg, tree.SrcDir())
}
if err != nil {
@ -220,22 +220,22 @@ func install(pkg, parent string) (built bool) {
return
}
if *nuke {
vlogf("%s: nuke\n", pkg)
printf("%s: nuke\n", pkg)
script.Nuke()
} else if *clean {
vlogf("%s: clean\n", pkg)
printf("%s: clean\n", pkg)
script.Clean()
}
if *doInstall {
if depBuilt || script.Stale() {
vlogf("%s: install\n", pkg)
printf("%s: install\n", pkg)
if err := script.Run(); err != nil {
errorf("%s: install: %v\n", pkg, err)
return
}
built = true
} else {
vlogf("%s: up-to-date\n", pkg)
printf("%s: up-to-date\n", pkg)
}
}
if remote {
@ -272,7 +272,7 @@ func genRun(dir string, stdin []byte, arg []string, quiet bool) os.Error {
cmd := exec.Command(arg[0], arg[1:]...)
cmd.Stdin = bytes.NewBuffer(stdin)
cmd.Dir = dir
vlogf("%s: %s %s\n", dir, cmd.Path, strings.Join(arg[1:], " "))
printf("%s: %s %s\n", dir, cmd.Path, strings.Join(arg[1:], " "))
out, err := cmd.CombinedOutput()
if err != nil {
if !quiet || *verbose {