summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Carr <[email protected]>2025-10-05 06:12:15 -0500
committerJeff Carr <[email protected]>2025-10-05 06:12:15 -0500
commit0d660048bdab42c9ed279181b89b9f55a6cd49da (patch)
treeec2307e5a7a8eafe996b270f5b30a254749218cc
parent4fcacb21d72ee64c36a46831ba316f36b84fb43c (diff)
s/gopath/namespace/v0.1.15
-rw-r--r--doBuild.go18
-rw-r--r--doListRepos.go8
-rw-r--r--exit.go1
-rw-r--r--tableRepos.go6
4 files changed, 16 insertions, 17 deletions
diff --git a/doBuild.go b/doBuild.go
index 5d7800b..8dbe9dd 100644
--- a/doBuild.go
+++ b/doBuild.go
@@ -41,11 +41,11 @@ func doInstallRepo(check *gitpb.Repo) error {
if repotype == "binary" || repotype == "plugin" {
// we only want to process things that can be compiled with 'go build'
} else {
- // log.Info("skipping repo", check.GetGoPath(), repotype)
+ // log.Info("skipping repo", check.Namespace, repotype)
return nil
}
- if me.forge.Config.IsReadOnly(check.GetGoPath()) {
+ if me.forge.Config.IsReadOnly(check.Namespace) {
// ignore read only stuff
return nil
}
@@ -53,12 +53,12 @@ func doInstallRepo(check *gitpb.Repo) error {
if argv.Verbose || argv.Force {
verbose := []string{"-v", "-x"}
if err := me.forge.Install(check, verbose); err != nil {
- log.Warn("INSTALL FAILED", check.GetGoPath(), err)
+ log.Warn("INSTALL FAILED", check.Namespace, err)
return err
}
} else {
if err := me.forge.Install(check, nil); err != nil {
- log.Warn("INSTALL FAILED", check.GetGoPath(), err)
+ log.Warn("INSTALL FAILED", check.Namespace, err)
return err
}
}
@@ -74,11 +74,11 @@ func doInstallScan() {
if repotype == "binary" || repotype == "plugin" {
// we only want to process things that can be compiled with 'go build'
} else {
- // log.Info("skipping repo", check.GetGoPath(), repotype)
+ // log.Info("skipping repo", check.Namespace, repotype)
continue
}
- if me.forge.Config.IsReadOnly(check.GetGoPath()) {
+ if me.forge.Config.IsReadOnly(check.Namespace) {
// ignore read only stuff
continue
}
@@ -93,7 +93,7 @@ func doInstallScan() {
manufactured := check.GetCurrentVersion()
ver := trimNonNumericFromStart(manufactured)
- name := me.forge.Config.DebName(check.GetGoPath())
+ name := me.forge.Config.DebName(check.GetNamespace())
var realver string
if installedPackage := me.machine.FindInstalledByName(name); installedPackage != nil {
realver = installedPackage.Version
@@ -148,7 +148,7 @@ func doInstallScan() {
log.Info(start, check.GetRepoType(), end)
if name == "" {
// err := fmt.Sprintf("name is blank error %+v", repo)
- log.Warn("name is blank error", check.GetGoPath())
+ log.Warn("name is blank error", check.GetNamespace())
}
}
}
@@ -159,7 +159,7 @@ func doInstall() error {
found := gitpb.NewRepos()
for check := range me.forge.Repos.IterAll() {
- if me.forge.Config.IsReadOnly(check.GetGoPath()) {
+ if me.forge.Config.IsReadOnly(check.Namespace) {
continue
}
diff --git a/doListRepos.go b/doListRepos.go
index 9d91375..d716fbc 100644
--- a/doListRepos.go
+++ b/doListRepos.go
@@ -18,11 +18,11 @@ func doListRepos() {
if repotype == "binary" || repotype == "plugin" {
// we only want to process things that can be compiled with 'go build'
} else {
- // log.Info("skipping repo", check.GetGoPath(), repotype)
+ // log.Info("skipping repo", check.Namespace, repotype)
continue
}
- if me.forge.Config.IsReadOnly(check.GetGoPath()) {
+ if me.forge.Config.IsReadOnly(check.Namespace) {
// ignore read only stuff
continue
}
@@ -36,7 +36,7 @@ func doListRepos() {
manufactured := check.GetCurrentVersion()
ver := trimNonNumericFromStart(manufactured)
- name := me.forge.Config.DebName(check.GetGoPath())
+ name := me.forge.Config.DebName(check.Namespace)
var realver string
if installedPackage := me.machine.FindInstalledByName(name); installedPackage != nil {
realver = installedPackage.Version
@@ -85,7 +85,7 @@ func doListRepos() {
log.Info(start, end)
if name == "" {
// err := fmt.Sprintf("name is blank error %+v", repo)
- log.Warn("name is blank error", check.GetGoPath())
+ log.Warn("name is blank error", check.Namespace)
}
}
}
diff --git a/exit.go b/exit.go
index a611bb8..6010a2e 100644
--- a/exit.go
+++ b/exit.go
@@ -47,7 +47,6 @@ func okExit(thing string) {
if thing != "" {
log.Info(thing, "ok")
}
- // log.Info("Finished go-clean on", check.GetGoPath(), "ok")
os.Exit(0)
}
diff --git a/tableRepos.go b/tableRepos.go
index 8112409..57be680 100644
--- a/tableRepos.go
+++ b/tableRepos.go
@@ -10,7 +10,7 @@ import (
func isPackageOnMirrors(repo *gitpb.Repo) bool {
manufactured := repo.GetCurrentVersion()
ver := trimNonNumericFromStart(manufactured)
- name := me.forge.Config.DebName(repo.GetGoPath())
+ name := me.forge.Config.DebName(repo.Namespace)
if actualp := me.machine.FindByVersion(name, ver); actualp != nil {
// end += " (version match) " + actualp.Version + " " + ver + " "
// repo.State = "on mirrors"
@@ -22,7 +22,7 @@ func isPackageOnMirrors(repo *gitpb.Repo) bool {
func debianFilename(repo *gitpb.Repo) string {
manufactured := repo.GetCurrentVersion()
ver := trimNonNumericFromStart(manufactured)
- name := me.forge.Config.DebName(repo.GetGoPath())
+ name := me.forge.Config.DebName(repo.Namespace)
if actualp := me.machine.FindByVersion(name, ver); actualp != nil {
return actualp.PkgName
}
@@ -52,7 +52,7 @@ func printPackagingTable(pb *gitpb.Repos) {
col = tablePB.AddStringFunc("is old", func(r *gitpb.Repo) string {
manufactured := r.GetCurrentVersion()
ver := trimNonNumericFromStart(manufactured)
- name := me.forge.Config.DebName(r.GetGoPath())
+ name := me.forge.Config.DebName(r.Namespace)
if actualp := me.machine.FindByVersion(name, ver); actualp != nil {
// end += " (version match) " + actualp.Version + " " + ver + " "
return ""