diff options
Diffstat (limited to 'wit.go')
| -rw-r--r-- | wit.go | 34 |
1 files changed, 17 insertions, 17 deletions
@@ -11,9 +11,9 @@ func (m *Machine) IsInstalled(name string) bool { if m.Packages == nil { panic("m.Packages nil in zoopb") } - for p := range m.Packages.IterByName() { - if name == p.Name { - // log.Info("package installed:", p.Name, p.Version, p.PkgName) + for p := range m.Packages.IterByPackage() { + if name == p.Package { + // log.Info("package installed:", p.Package, p.Version, p.PkgName) return true } } @@ -30,11 +30,11 @@ func (m *Machine) FindInstalledByName(name string) *Package { panic("m.Packages == nil") } // log.Info("FindInstalledByName len=", m.Packages.Len()) - return m.Packages.FindByName(name) + return m.Packages.FindByPackage(name) /* for p := range m.Packages.IterByName() { - if name == p.Name { - // log.Info("package installed:", p.Name, p.Version, p.PkgName) + if name == p.Package { + // log.Info("package installed:", p.Package, p.Version, p.PkgName) return p } } @@ -48,8 +48,8 @@ func (m *Machine) FindInstalledByName(name string) *Package { // if version == "", return the first name found func (m *Machine) FindVersion(name string) string { // first check all installed versions - for p := range m.Packages.IterByName() { - if name == p.Name { + for p := range m.Packages.IterByPackage() { + if name == p.Package { return p.Version } } @@ -59,13 +59,13 @@ func (m *Machine) FindVersion(name string) string { func (m *Machine) FindInstalledPackage(check *Package) *Package { /* for p := range m.Packages.IterByName() { - if (check.Name == p.Name) && (check.Version == p.Version) { + if (check.Package == p.Package) && (check.Version == p.Version) { return p } } */ - for p := range m.Wit.IterByName() { - if (check.Name == p.Name) && (check.Version == p.Version) { + for p := range m.Wit.IterByPackage() { + if (check.Package == p.Package) && (check.Version == p.Version) { return p } } @@ -76,8 +76,8 @@ func (m *Machine) FindInstalledPackage(check *Package) *Package { // if version == "", return the first name found func (m *Machine) FindByVersion(name string, version string) *Package { // first check all installed versions - for p := range m.Packages.IterByName() { - if name == p.Name { + for p := range m.Packages.IterByPackage() { + if name == p.Package { if version == "" { return p } else { @@ -89,8 +89,8 @@ func (m *Machine) FindByVersion(name string, version string) *Package { } // check all wit packages - for p := range m.Wit.IterByName() { - if name == p.Name { + for p := range m.Wit.IterByPackage() { + if name == p.Package { if version == "" { return p } @@ -106,8 +106,8 @@ func (m *Machine) FindByVersion(name string, version string) *Package { } } // give anything with the same name - for p := range m.Wit.IterByName() { - if name == p.Name { + for p := range m.Wit.IterByPackage() { + if name == p.Package { return p } } |