dumb stuffv0.0.69v0.0.68v0.0.67v0.0.66

2 files changed, 13 insertions, 8 deletions

diff --git a/init.go b/init.go
index 4e86058..2b89ff5 100644
--- a/init.go
+++ b/init.go
@@ -27,6 +27,7 @@ func InitMachine() (*Machine, string) {
 	hostname, _ := os.Hostname()
 	m.Hostname = hostname
 	m.Distro = detectDistro()
+	m.Packages = NewPackages()
 	m.initPackages()
 
 	m.InitWitMirrors()
diff --git a/wit.go b/wit.go
index 47fc37e..fecca13 100644
--- a/wit.go
+++ b/wit.go
@@ -25,15 +25,19 @@ func (m *Machine) FindInstalledByName(name string) *Package {
 	if m.Packages == nil {
 		panic("m.Packages == nil")
 	}
-	for p := range m.Packages.IterByName() {
-		if name == p.Name {
-			// log.Info("package installed:", p.Name, p.Version, p.PkgName)
-			return p
+	// log.Info("FindInstalledByName len=", m.Packages.Len())
+	return m.Packages.FindByName(name)
+	/*
+		for p := range m.Packages.IterByName() {
+			if name == p.Name {
+				// log.Info("package installed:", p.Name, p.Version, p.PkgName)
+				return p
+			}
 		}
-	}
 
-	// log.Info("package not-installed:", name)
-	return nil
+		// log.Info("package not-installed:", name)
+		return nil
+	*/
 }
 
 // looks to see if any package matches a name and version
@@ -84,7 +88,7 @@ func (m *Machine) FindByVersion(name string, version string) *Package {
 // obviously a hack at this point
 // read the package list file from mirrors.wit.com
 func (m *Machine) InitWitMirrors() error {
-	m.Wit = new(Packages)
+	m.Wit = NewPackages()
 	err := m.scanPackageListFile("/var/lib/apt/lists/mirrors.wit.com_wit_dists_sid_main_binary-amd64_Packages")
 	return err
 }