Fix os.RemoveAll() for windows pre-go1.7

Fixes golang#18.

Author: sdboyer

manager_test.go

@@ -45,7 +45,12 @@ func TestSourceManagerInit(t *testing.T) {
 	if err != nil {
 		t.Errorf("Unexpected error on SourceManager creation: %s", err)
 	}
-	defer os.RemoveAll(cpath)
+	defer func() {
+		err := removeAll(cpath)
+		if err != nil {
+			t.Errorf("removeAll failed: %s", err)
+		}
+	}()
 
 	_, err = NewSourceManager(cpath, bd, false, dummyAnalyzer{})
 	if err == nil {
@@ -79,8 +84,13 @@ func TestProjectManagerInit(t *testing.T) {
 		t.Errorf("Unexpected error on SourceManager creation: %s", err)
 		t.FailNow()
 	}
+	defer func() {
+		err := removeAll(cpath)
+		if err != nil {
+			t.Errorf("removeAll failed: %s", err)
+		}
+	}()
 	defer sm.Release()
-	defer os.RemoveAll(cpath)
 
 	pn := ProjectName("github.com/Masterminds/VCSTestRepo")
 	v, err := sm.ListVersions(pn)
@@ -210,15 +220,20 @@ func TestRepoVersionFetching(t *testing.T) {
 		pmi, err := sm.getProjectManager(u)
 		if err != nil {
 			sm.Release()
-			os.RemoveAll(cpath)
+			removeAll(cpath)
 			t.Errorf("Unexpected error on ProjectManager creation: %s", err)
 			t.FailNow()
 		}
 		pms[k] = pmi.pm.(*projectManager)
 	}
 
+	defer func() {
+		err := removeAll(cpath)
+		if err != nil {
+			t.Errorf("removeAll failed: %s", err)
+		}
+	}()
 	defer sm.Release()
-	defer os.RemoveAll(cpath)
 
 	// test git first
 	vlist, exbits, err := pms[0].crepo.getCurrentVersionPairs()
@@ -305,8 +320,13 @@ func TestGetInfoListVersionsOrdering(t *testing.T) {
 		t.Errorf("Unexpected error on SourceManager creation: %s", err)
 		t.FailNow()
 	}
+	defer func() {
+		err := removeAll(cpath)
+		if err != nil {
+			t.Errorf("removeAll failed: %s", err)
+		}
+	}()
 	defer sm.Release()
-	defer os.RemoveAll(cpath)
 
 	// setup done, now do the test
 

project_manager.go

@@ -531,7 +531,7 @@ func stripVendor(path string, info os.FileInfo, err error) error {
 	if info.Name() == "vendor" {
 		if _, err := os.Lstat(path); err == nil {
 			if info.IsDir() {
-				return os.RemoveAll(path)
+				return removeAll(path)
 			}
 		}
 	}

remove_go16.go

@@ -0,0 +1,38 @@
+// +build !go1.7
+
+package vsolver
+
+import (
+	"os"
+	"path/filepath"
+	"runtime"
+)
+
+// removeAll removes path and any children it contains. It deals correctly with
+// removal on Windows where, prior to Go 1.7, there were issues when files were
+// set to read-only.
+func removeAll(path string) error {
+	// Only need special handling for windows
+	if runtime.GOOS != "windows" {
+		return os.RemoveAll(path)
+	}
+
+	// Simple case: if Remove works, we're done.
+	err := os.Remove(path)
+	if err == nil || os.IsNotExist(err) {
+		return nil
+	}
+
+	// make sure all files are writable so we can delete them
+	return filepath.Walk(path, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			// walk gave us some error, give it back.
+			return err
+		}
+		mode := info.Mode()
+		if mode|0200 == mode {
+			return nil
+		}
+		return os.Chmod(path, mode|0200)
+	})
+}

remove_go17.go

@@ -0,0 +1,11 @@
+// +build go1.7
+
+package vsolver
+
+import "os"
+
+// go1.7 and later deal with the file perms issue in os.RemoveAll(), so our
+// workaround is no longer necessary.
+func removeAll(path string) error {
+	return os.RemoveAll(path)
+}

result.go

@@ -46,7 +46,7 @@ func CreateVendorTree(basedir string, l Lock, sm SourceManager, sv bool) error {
 
 		err = sm.ExportProject(p.Ident().LocalName, p.Version(), to)
 		if err != nil {
-			os.RemoveAll(basedir)
+			removeAll(basedir)
 			return fmt.Errorf("Error while exporting %s: %s", p.Ident().LocalName, err)
 		}
 		if sv {