diff --git a/pkg/package/database_boltdb.go b/pkg/package/database_boltdb.go index bdff49ad..4900140e 100644 --- a/pkg/package/database_boltdb.go +++ b/pkg/package/database_boltdb.go @@ -17,6 +17,7 @@ package pkg import ( "encoding/base64" + "fmt" "os" "regexp" "strconv" @@ -228,7 +229,7 @@ func (db *BoltDatabase) getProvide(p Package) (Package, error) { db.Unlock() if !ok { - return nil, errors.New("No versions found for package") + return nil, errors.New(fmt.Sprintf("No versions found for: %s", p.HumanReadableString())) } for ve, _ := range versions { @@ -240,7 +241,7 @@ func (db *BoltDatabase) getProvide(p Package) (Package, error) { if match { pa, ok := db.ProvidesDatabase[p.GetPackageName()][ve] if !ok { - return nil, errors.New("No versions found for package") + return nil, errors.New(fmt.Sprintf("No versions found for: %s", p.HumanReadableString())) } return pa, nil //pick the first (we shouldn't have providers that are conflicting) // TODO: A find dbcall here would recurse, but would give chance to have providers of providers @@ -309,7 +310,7 @@ func (db *BoltDatabase) RemovePackage(p Package) error { var found DefaultPackage err = bolt.Select(q.Eq("Name", p.GetName()), q.Eq("Category", p.GetCategory()), q.Eq("Version", p.GetVersion())).Limit(1).Delete(&found) if err != nil { - return errors.Wrap(err, "No package found to delete") + return errors.New(fmt.Sprintf("Package not found: %s", p.HumanReadableString())) } return nil } diff --git a/pkg/package/database_mem.go b/pkg/package/database_mem.go index c291bcef..7264c297 100644 --- a/pkg/package/database_mem.go +++ b/pkg/package/database_mem.go @@ -18,6 +18,7 @@ package pkg import ( "encoding/base64" "encoding/json" + "fmt" "regexp" "sync" @@ -59,7 +60,7 @@ func (db *InMemoryDatabase) Get(s string) (string, error) { defer db.Unlock() pa, ok := db.Database[s] if !ok { - return "", errors.New("No key found with that id") + return "", errors.New(fmt.Sprintf("No key found for: %s", s)) } return pa, nil } @@ -248,7 +249,7 @@ func (db *InMemoryDatabase) FindPackages(p Package) (Packages, error) { } versions, ok := db.CacheNoVersion[p.GetPackageName()] if !ok { - return nil, errors.New("No versions found for package") + return nil, errors.New(fmt.Sprintf("No versions found for: %s", p.HumanReadableString())) } var versionsInWorld []Package for ve, _ := range versions { @@ -277,7 +278,7 @@ func (db *InMemoryDatabase) UpdatePackage(p Package) error { return db.Set(p.GetFingerPrint(), enc) - return errors.New("Package not found") + return errors.New(fmt.Sprintf("Package not found: %s", p.HumanReadableString())) } func (db *InMemoryDatabase) GetPackages() []string { @@ -302,7 +303,7 @@ func (db *InMemoryDatabase) GetPackageFiles(p Package) ([]string, error) { pa, ok := db.FileDatabase[p.GetFingerPrint()] if !ok { - return pa, errors.New("No key found with that id") + return pa, errors.New(fmt.Sprintf("No key found for: %s", p.HumanReadableString())) } return pa, nil