new .proto filev0.1.30

1 files changed, 5 insertions, 22 deletions

diff --git a/tablePackaging.go b/tablePackaging.go
index 74f2e0d..496ae95 100644
--- a/tablePackaging.go
+++ b/tablePackaging.go
@@ -15,15 +15,15 @@ func isPackageOnMirrors(repo *gitpb.Repo) bool {
 	name := me.forge.Config.DebName(repo.Namespace)
 	for pkg := range me.machine.Wit.IterAll() {
 		// log.Info(pkg)
-		if name == pkg.Name {
+		if name == pkg.Package {
 			found = pkg
 		}
 	}
 	if found == nil {
 		return false
 	}
-	if found.PkgName == "" {
-		log.Info("found", found)
+	if found.Filename == "" {
+		log.Info("filename was blank. did not find?", found)
 	}
 	return true
 }
@@ -31,8 +31,8 @@ func isPackageOnMirrors(repo *gitpb.Repo) bool {
 func getDebFilename(repo *gitpb.Repo) string {
 	name := me.forge.Config.DebName(repo.Namespace)
 	for pkg := range me.machine.Wit.IterAll() {
-		if name == pkg.Name {
-			return pkg.PkgName
+		if name == pkg.Package {
+			return pkg.Filename
 		}
 	}
 	return ""
@@ -63,23 +63,6 @@ func makePackagingTable(pb *gitpb.Repos) *gitpb.ReposTable {
 	})
 	col.Width = 16
 
-	/*
-		col = tablePB.AddStringFunc("is old", func(r *gitpb.Repo) string {
-			manufactured := r.GetCurrentVersion()
-			ver := trimNonNumericFromStart(manufactured)
-			name := me.forge.Config.DebName(r.Namespace)
-			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 ""
-		})
-		col.Width = 10
-	*/
-
 	col = tablePB.AddStringFunc("I", func(r *gitpb.Repo) string {
 		debname := me.forge.Config.DebName(r.GetNamespace())
 		if me.machine.IsInstalled(debname) {