diff options
| -rw-r--r-- | doBuild.go | 2 | ||||
| -rw-r--r-- | doDebian.go | 86 | ||||
| -rw-r--r-- | tableRepos.go | 54 |
3 files changed, 44 insertions, 98 deletions
@@ -83,7 +83,7 @@ func doInstallScan() { continue } - if check.GetState() == "" || check.GetState() == "PERFECT" { + if check.GetState() == "" { check.State = "need to build" } diff --git a/doDebian.go b/doDebian.go index af7e253..840528d 100644 --- a/doDebian.go +++ b/doDebian.go @@ -4,10 +4,8 @@ package main import ( - "fmt" "os" "path/filepath" - "strings" "go.wit.com/lib/gui/shell" "go.wit.com/lib/protobuf/gitpb" @@ -45,7 +43,7 @@ func doDebian() error { found.Append(check) } - printRepos(found) + printPackagingTable(found) // func (f *Forge) isInstalled(repo *gitpb.Repo) string { // return "X" @@ -76,70 +74,6 @@ func doDebian() error { return nil } -func getStatusEnd(repo *gitpb.Repo) string { - var end string - - manufactured := repo.GetCurrentVersion() - ver := trimNonNumericFromStart(manufactured) - name := me.forge.Config.DebName(repo.GetGoPath()) - var realver string - if installedPackage := me.machine.FindInstalledByName(name); installedPackage != nil { - realver = installedPackage.Version - } - if actualp := me.machine.FindByVersion(name, ver); actualp != nil { - // end += " (version match) " + actualp.Version + " " + ver + " " - // repo.State = "on mirrors" - } else { - if realver != "" { - end += fmt.Sprintf(" (version miss) %s vs %s ", realver, ver) - } - // end += "" + ver + " " - } - - debname := name + "_" + ver + "_amd64.deb" - // debnames[repo] = debname - outdir := getOutdir(repo) - _, err := os.Stat(filepath.Join(outdir, debname)) - if err == nil { - // log.Info("exists", filepath.Join(outdir, debname)) - repo.State = "in incoming" - } else { - // log.Info(debname, "does not exist") - } - if strings.HasPrefix(repo.GetState(), "unknown bran") { - end += " (will build) " - } - - if repo.State == "" { - end += " (will build) " - } - - if repo.State == "need to build" { - end += " (will build) " - } - - if name == "" { - // err := fmt.Sprintf("name is blank error %+v", repo) - log.Warn("name is blank error", repo.GetGoPath()) - } - return end -} - -func shouldBuild(repo *gitpb.Repo) bool { - if argv.Force { - return true - } - - if repo.State == "need to build" { - return true - } - if isPackageOnMirrors(repo) { - return false - } - - return false -} - // avoids nil panics func isDebianRelease() bool { if argv.Build == nil { @@ -151,6 +85,13 @@ func isDebianRelease() bool { return argv.Build.Debian.Release } +func shouldBuild(check *gitpb.Repo) bool { + if isPackageOnMirrors(check) { + return false + } + return true +} + func buildDeb(check *gitpb.Repo) error { var cmd []string @@ -167,14 +108,15 @@ func buildDeb(check *gitpb.Repo) error { return nil } - if !shouldBuild(check) { - return nil - } - if argv.Verbose || argv.Force { // log.Info("build cmd:", cmd) cmd = append(cmd, "--verbose") } + + if !shouldBuild(check) { + return nil + } + if argv.DryRun { log.Info("RUN:", check.FullPath, cmd) return nil @@ -243,7 +185,7 @@ func doOnlyDebianPackages() error { found.Append(check) } - printRepos(found) + printPackagingTable(found) me.forge.ConfigRill(16, 16) log.Info("STARTING .deb BUILDS repo len =", found.Len()) diff --git a/tableRepos.go b/tableRepos.go index f478287..8112409 100644 --- a/tableRepos.go +++ b/tableRepos.go @@ -19,7 +19,17 @@ func isPackageOnMirrors(repo *gitpb.Repo) bool { return false } -func printRepos(pb *gitpb.Repos) { +func debianFilename(repo *gitpb.Repo) string { + manufactured := repo.GetCurrentVersion() + ver := trimNonNumericFromStart(manufactured) + name := me.forge.Config.DebName(repo.GetGoPath()) + if actualp := me.machine.FindByVersion(name, ver); actualp != nil { + return actualp.PkgName + } + return "hmm" +} + +func printPackagingTable(pb *gitpb.Repos) { tablePB := pb.NewTable("deb details") tablePB.NewUuid() @@ -36,22 +46,24 @@ func printRepos(pb *gitpb.Repos) { col = tablePB.AddStringFunc("Build Version", func(r *gitpb.Repo) string { return me.forge.GetPackageVersion(r) }) - col.Width = 24 + col.Width = 12 - col = tablePB.AddStringFunc("is old", func(r *gitpb.Repo) string { - manufactured := r.GetCurrentVersion() - ver := trimNonNumericFromStart(manufactured) - name := me.forge.Config.DebName(r.GetGoPath()) - if actualp := me.machine.FindByVersion(name, ver); actualp != nil { - // end += " (version match) " + actualp.Version + " " + ver + " " + /* + col = tablePB.AddStringFunc("is old", func(r *gitpb.Repo) string { + manufactured := r.GetCurrentVersion() + ver := trimNonNumericFromStart(manufactured) + name := me.forge.Config.DebName(r.GetGoPath()) + if actualp := me.machine.FindByVersion(name, ver); actualp != nil { + // end += " (version match) " + actualp.Version + " " + ver + " " + return "" + } + if installedPackage := me.machine.FindInstalledByName(name); installedPackage != nil { + return installedPackage.Version + } return "" - } - if installedPackage := me.machine.FindInstalledByName(name); installedPackage != nil { - return installedPackage.Version - } - return "" - }) - col.Width = 10 + }) + col.Width = 10 + */ col = tablePB.AddStringFunc("I", func(r *gitpb.Repo) string { name := me.forge.Config.DebName(r.GetNamespace()) @@ -82,19 +94,11 @@ func printRepos(pb *gitpb.Repos) { }) col.Width = 5 - col = tablePB.AddStringFunc("deb name", func(r *gitpb.Repo) string { - name := me.forge.Config.DebName(r.GetNamespace()) - ver := me.forge.GetPackageVersion(r) - debname := name + "_" + ver + "_amd64.deb" - return debname - }) - col.Width = 32 - col = tablePB.AddState() col.Width = 32 - col = tablePB.AddStringFunc("end", func(r *gitpb.Repo) string { - return getStatusEnd(r) + col = tablePB.AddStringFunc("deb name", func(r *gitpb.Repo) string { + return debianFilename(r) }) col.Width = -1 |