cleanup the .proto

1 files changed, 7 insertions, 10 deletions

diff --git a/tableDefault.go b/tableDefault.go
index 4d39176..bc3ef86 100644
--- a/tableDefault.go
+++ b/tableDefault.go
@@ -51,7 +51,7 @@ func (m *Machine) PrintTable(pb *Packages) {
 	tablePB.PrintTable()
 	var i int
 	for p := range pb.IterAll() {
-		if m.IsInstalled(p.Name) {
+		if m.IsInstalled(p.Package) {
 			i += 1
 		}
 	}
@@ -62,7 +62,7 @@ func (m *Machine) PrintTable(pb *Packages) {
 func (m *Machine) PrintInstalledTable() {
 	installed := NewPackages()
 	for p := range m.Wit.IterAll() {
-		if m.IsInstalled(p.Name) {
+		if m.IsInstalled(p.Package) {
 			installed.Append(p)
 		}
 	}
@@ -78,7 +78,7 @@ func (m *Machine) makeSmartTable(pb *Packages) *PackagesTable {
 	var col *PackageFunc
 
 	col = t.AddStringFunc("  I", func(p *Package) string {
-		if m.IsInstalled(p.Name) {
+		if m.IsInstalled(p.Package) {
 			return "  X"
 		}
 		return ""
@@ -101,7 +101,7 @@ func (m *Machine) makeSmartTable(pb *Packages) *PackagesTable {
 	})
 	col.Width = 3
 
-	col = t.AddName()
+	col = t.AddPackage()
 	col.Width = 16
 
 	col = t.AddVersion()
@@ -110,10 +110,7 @@ func (m *Machine) makeSmartTable(pb *Packages) *PackagesTable {
 	col = t.AddMD5SUM()
 	col.Width = 8
 
-	col = t.AddPackageBuildDate()
-	col.Width = 20
-
-	col = t.AddPkgName()
+	col = t.AddFilename()
 	col.Width = -1
 	col.Header.Name = "apt package path"
 
@@ -122,7 +119,7 @@ func (m *Machine) makeSmartTable(pb *Packages) *PackagesTable {
 
 // true if the package 'p' is newer than the installed package
 func (m *Machine) WillUpgrade(p *Package) bool {
-	check := m.FindInstalledByName(p.Name)
+	check := m.FindInstalledByName(p.Package)
 	if check == nil {
 		// not installed. can not upgrade
 		return false
@@ -144,7 +141,7 @@ func (m *Machine) WillUpgrade(p *Package) bool {
 // this means somehow this machine has a newer version than the mirrors have
 // true if the package 'p' is newer than the installed package
 func (m *Machine) MirrorsOutOfDate(p *Package) bool {
-	check := m.FindInstalledByName(p.Name)
+	check := m.FindInstalledByName(p.Package)
 	if check == nil {
 		// not installed
 		return false