3 files changed, 19 insertions, 36 deletions

diff --git a/doUpgrade.go b/doUpgrade.go
index 1cda60d..6405f83 100644
--- a/doUpgrade.go
+++ b/doUpgrade.go
@@ -13,11 +13,11 @@ import (
 
 func doPackageList(all bool) {
 	installed := zoopb.NewPackages()
-	for p := range me.machine.Wit.IterByName() {
+	for p := range me.machine.Wit.IterByPackage() {
 		if all {
 			installed.Append(p)
 		} else {
-			found := me.machine.FindInstalledByName(p.Name)
+			found := me.machine.FindInstalledByName(p.Package)
 			if found == nil {
 				continue
 			}
@@ -54,24 +54,24 @@ func doUpgrade() error {
 
 	if argv.Force {
 		// force remove the packages. can be used if binaries change but versions didn't
-		for p := range me.machine.Wit.IterByName() {
-			if me.machine.IsInstalled(p.Name) {
-				debian.AptRemove(p.Name)
+		for p := range me.machine.Wit.IterByPackage() {
+			if me.machine.IsInstalled(p.Package) {
+				debian.AptRemove(p.Package)
 			}
 		}
 	}
 
-	for p := range me.machine.Wit.IterByName() {
+	for p := range me.machine.Wit.IterByPackage() {
 		if me.machine.WillUpgrade(p) {
 			if argv.DryRun {
 				log.Info("Would install here without --dry-run")
 				continue
 			}
 			if argv.Force {
-				debian.AptInstall(p.Name)
+				debian.AptInstall(p.Package)
 				continue
 			}
-			if _, err := debian.AptInstall(p.Name); err != nil {
+			if _, err := debian.AptInstall(p.Package); err != nil {
 				me.sh.BadExit("damn it", err)
 			}
 		}
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) {
diff --git a/upgrade.go b/upgrade.go
index ef1e39e..98af932 100644
--- a/upgrade.go
+++ b/upgrade.go
@@ -13,20 +13,20 @@ func doAptList() {
 	log.DaemonMode(true)
 	defer log.DaemonMode(false)
 	fmt.Println("Installed Packages:")
-	loop := me.machine.Wit.SortByName()
+	loop := me.machine.Wit.SortByPackage()
 	for loop.Scan() {
 		p := loop.Next()
 		var end string
 		var version string
-		if me.forge.Config.IsPrivate(p.Name) {
+		if me.forge.Config.IsPrivate(p.Package) {
 			end += "(private) "
 		}
-		if actualp := me.machine.FindByVersion(p.Name, p.Version); actualp != nil {
+		if actualp := me.machine.FindByVersion(p.Package, p.Version); actualp != nil {
 			// end += "(version match) "
 		} else {
 			end += "(version mismatch) " + actualp.Version + " " + version + " "
 		}
-		if actualp := me.machine.FindInstalledByName(p.Name); actualp != nil {
+		if actualp := me.machine.FindInstalledByName(p.Package); actualp != nil {
 			if p.Version != actualp.Version {
 				end += "(installed " + actualp.Version + " vs " + p.Version + ") "
 			} else {
@@ -34,12 +34,12 @@ func doAptList() {
 			}
 			version = actualp.Version
 		}
-		if me.forge.Config.IsReadOnly(p.Name) {
+		if me.forge.Config.IsReadOnly(p.Package) {
 			// end += " (readonly) "
 		} else {
 			end += "(writable) "
 		}
-		log.Printf("%-30s %-8s %s\n", p.Name, p.Version, end) // p.PkgName)
+		log.Printf("%-30s %-8s %s\n", p.Package, p.Version, end) // p.PkgName)
 	}
 	me.sh.GoodExit("")
 }