diff options
Diffstat (limited to 'patch.Make.go')
| -rw-r--r-- | patch.Make.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/patch.Make.go b/patch.Make.go index 5341cb8..cca74c4 100644 --- a/patch.Make.go +++ b/patch.Make.go @@ -19,7 +19,7 @@ func (f *Forge) MakeDevelPatchSet() (*Patchs, error) { defer os.RemoveAll(dir) // clean up pset.TmpDir = dir - all := f.Repos.SortByGoPath() + all := f.Repos.SortByFullPath() for all.Scan() { repo := all.Next() userb := repo.GetUserBranchName() @@ -50,7 +50,7 @@ func (f *Forge) MakeMasterPatchSet() (*Patchs, error) { defer os.RemoveAll(dir) // clean up pset.TmpDir = dir - all := f.Repos.SortByGoPath() + all := f.Repos.SortByFullPath() for all.Scan() { repo := all.Next() startb := repo.GetMasterBranchName() @@ -62,7 +62,7 @@ func (f *Forge) MakeMasterPatchSet() (*Patchs, error) { if endb == "" { continue } - // log.Info("repo", repo.GoPath, startb, "..", endb) + // log.Info("repo", repo.GetGoPath(), startb, "..", endb) pset.StartBranchName = startb pset.EndBranchName = endb err := pset.makePatchSetNew(repo) @@ -76,7 +76,7 @@ func (f *Forge) MakeMasterPatchSet() (*Patchs, error) { func (pset *Patchs) makePatchSetNew(repo *gitpb.Repo) error { startBranch := pset.StartBranchName endBranch := pset.EndBranchName - repoDir := filepath.Join(pset.TmpDir, repo.GoPath) + repoDir := filepath.Join(pset.TmpDir, repo.GetGoPath()) err := os.MkdirAll(repoDir, 0755) if err != nil { return err @@ -115,7 +115,7 @@ func (f *Forge) MakePatchSet() (*Patchs, error) { } defer os.RemoveAll(dir) // clean up - all := f.Repos.SortByGoPath() + all := f.Repos.SortByFullPath() for all.Scan() { repo := all.Next() userb := repo.GetUserBranchName() @@ -128,7 +128,7 @@ func (f *Forge) MakePatchSet() (*Patchs, error) { continue } - repoDir := filepath.Join(dir, repo.GoPath) + repoDir := filepath.Join(dir, repo.GetGoPath()) err := os.MkdirAll(repoDir, 0755) if err != nil { return nil, err |