From: Sanjay Menakuru <balasanjay@gmail.com>
Date: Mon, 6 Feb 2012 17:40:59 +0000 (-0500)
Subject: cmd/go: fixed panic on `go clean -n` and `go clean -x`.
X-Git-Tag: weekly.2012-02-07~37
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=39611ec880779c4e093a4789c7d1a16d25f50795;p=gostls13.git

cmd/go: fixed panic on `go clean -n` and `go clean -x`.
        also made generated scripts act more like running go clean itself

R=golang-dev
CC=golang-dev, rsc
https://golang.org/cl/5624049
---

diff --git a/src/cmd/go/clean.go b/src/cmd/go/clean.go
index 48ddc0ab60..1ea12b9624 100644
--- a/src/cmd/go/clean.go
+++ b/src/cmd/go/clean.go
@@ -5,6 +5,7 @@
 package main
 
 import (
+	"fmt"
 	"io/ioutil"
 	"os"
 	"path/filepath"
@@ -112,6 +113,7 @@ func clean(p *Package) {
 	}
 
 	var b builder
+	b.print = fmt.Print
 
 	packageFile := map[string]bool{}
 	if p.Name != "main" {
@@ -146,7 +148,7 @@ func clean(p *Package) {
 		}
 	}
 	if cleanN || cleanX {
-		b.showcmd(p.Dir, "rm %s", strings.Join(allRemove, " "))
+		b.showcmd(p.Dir, "rm -f %s", strings.Join(allRemove, " "))
 	}
 
 	toRemove := map[string]bool{}
@@ -180,7 +182,7 @@ func clean(p *Package) {
 
 	if cleanI && p.target != "" {
 		if cleanN || cleanX {
-			b.showcmd("", "rm %s", p.target)
+			b.showcmd("", "rm -f %s", p.target)
 		}
 		if !cleanN {
 			os.Remove(p.target)