summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config.go17
-rw-r--r--init.go4
-rw-r--r--rill.go4
-rw-r--r--structs.go8
4 files changed, 15 insertions, 18 deletions
diff --git a/config.go b/config.go
index dc94480..54d4ee3 100644
--- a/config.go
+++ b/config.go
@@ -3,10 +3,7 @@
package forgepb
import (
- "time"
-
"go.wit.com/log"
- timestamppb "google.golang.org/protobuf/types/known/timestamppb"
)
// returns err1 || err2
@@ -19,12 +16,14 @@ func (f *Forge) ConfigSave() error {
}
}
if f.Repos != nil {
- // ???
- if f.HasFullScan() {
- f.Repos.HasFullScan = true
- t := time.Now()
- f.Repos.FullScan = timestamppb.New(t)
- }
+ /*
+ // ???
+ if f.HasFullScan() {
+ f.Repos.HasFullScan = true
+ t := time.Now()
+ f.Repos.FullScan = timestamppb.New(t)
+ }
+ */
if e := f.Repos.ConfigSave(); e != nil {
log.Info("forge.Repos.ConfigSave() error", e)
err = e
diff --git a/init.go b/init.go
index 8817ddc..c5b8264 100644
--- a/init.go
+++ b/init.go
@@ -142,7 +142,7 @@ func (f *Forge) setenv() {
log.Info("forge.Config() was nil")
os.Exit(-1)
}
- f.configDir = os.Getenv("FORGE_CONFIG")
+ // f.configDir = os.Getenv("FORGE_CONFIG")
f.goSrc = os.Getenv("FORGE_GOSRC")
f.forgeURL = os.Getenv("FORGE_URL")
f.hostname = os.Getenv("HOSTNAME")
@@ -225,7 +225,7 @@ func (f *Forge) configENV() bool {
changed = true
}
- f.configDir = os.Getenv("FORGE_CONFIG")
+ // f.configDir = os.Getenv("FORGE_CONFIG")
f.goSrc = os.Getenv("FORGE_GOSRC")
f.forgeURL = os.Getenv("FORGE_URL")
// f.patchDir = os.Getenv("FORGE_PATCHDIR")
diff --git a/rill.go b/rill.go
index 158842f..2a1e8ac 100644
--- a/rill.go
+++ b/rill.go
@@ -79,7 +79,7 @@ func (f *Forge) RillReload() int {
var all []*gitpb.Repo
for repo := range f.Repos.IterAll() {
if !repo.IsValidDir() {
- log.Printf("%s %-50s\n", "got an invalid repo in forgepb.RillReload()", repo.GetGoPath())
+ log.Printf("%s %-50s\n", "got an invalid repo in forgepb.RillReload()", repo.GetFullPath())
continue
}
all = append(all, repo)
@@ -141,7 +141,7 @@ func (f *Forge) RillRepos(rillf func(*gitpb.Repo) error) map[string]*RillStats {
for repo := range f.Repos.IterAll() {
if !repo.IsValidDir() {
- log.Printf("got an invalid repo in forgepb.RillRepos() %-50s\n", repo.GetGoPath())
+ log.Printf("got an invalid repo in forgepb.RillRepos() %-50s\n", repo.GetFullPath())
continue
}
all = append(all, repo)
diff --git a/structs.go b/structs.go
index 99d5172..07c4af0 100644
--- a/structs.go
+++ b/structs.go
@@ -24,7 +24,7 @@ type Forge struct {
rillX int // used for Rill()
rillY int // used for Rill()
Patchsets *Patchsets // patches that are in progress
- configDir string // normally ~/.config/forge
+ // configDir string // normally ~/.config/forge
// patchDir string // where patches are stored
}
@@ -32,14 +32,11 @@ func (f *Forge) GetGoSrc() string {
return f.goSrc
}
-func (f *Forge) GetConfigDir() string {
- return f.configDir
-}
-
func (f *Forge) IsGoWork() bool {
return f.goWork
}
+/*
func (f *Forge) HasFullScan() bool {
return f.Repos.HasFullScan
}
@@ -52,3 +49,4 @@ func (f *Forge) FullScanAge() time.Duration {
fs := f.Repos.FullScan.AsTime()
return time.Since(fs)
}
+*/