Skip to content
This repository has been archived by the owner on Feb 3, 2018. It is now read-only.

Commit

Permalink
Windows-friendly filepath join
Browse files Browse the repository at this point in the history
  • Loading branch information
sdboyer committed Aug 1, 2016
1 parent cfa2b1f commit 2cf87ac
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions manager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ func TestProjectManagerInit(t *testing.T) {
}

// Two birds, one stone - make sure the internal ProjectManager vlist cache
// works by asking for the versions again, and do it through smcache to
// ensure its sorting works, as well.
// works (or at least doesn't not work) by asking for the versions again,
// and do it through smcache to ensure its sorting works, as well.
smc := &bridge{
sm: sm,
vlists: make(map[ProjectIdentifier][]Version),
Expand Down
4 changes: 2 additions & 2 deletions project_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"go/build"
"os"
"os/exec"
"path"
"path/filepath"
"strings"
"sync"

Expand Down Expand Up @@ -496,7 +496,7 @@ func (r *repo) exportVersionTo(v Version, to string) error {
switch r.r.(type) {
case *vcs.GitRepo:
// Back up original index
idx, bak := path.Join(r.rpath, ".git", "index"), path.Join(r.rpath, ".git", "origindex")
idx, bak := filepath.Join(r.rpath, ".git", "index"), filepath.Join(r.rpath, ".git", "origindex")
err := os.Rename(idx, bak)
if err != nil {
return err
Expand Down

0 comments on commit 2cf87ac

Please sign in to comment.