mirror of
https://github.com/aptly-dev/aptly.git
synced 2026-10-21 10:58:23 +00:00
Handle corner-case: null reflist.
This commit is contained in:
1 parent
97becf199f
commit
1b64612aef
2 files changed
+9
No files matched your search
Vendored
+5
@@ -51,6 +51,11 @@ func NewPackageList() *PackageList {
|
||||
|
||||
// NewPackageListFromRefList loads packages list from PackageRefList
|
||||
func NewPackageListFromRefList(reflist *PackageRefList, collection *PackageCollection) (*PackageList, error) {
|
||||
// empty reflist
|
||||
if reflist == nil {
|
||||
return NewPackageList(), nil
|
||||
}
|
||||
|
||||
result := &PackageList{packages: make(map[string]*Package, reflist.Len())}
|
||||
|
||||
err := reflist.ForEach(func(key []byte) error {
|
||||
|
||||
Vendored
+4
@@ -287,6 +287,10 @@ func (s *PackageListSuite) TestNewPackageListFromRefList(c *C) {
|
||||
c.Assert(err, IsNil)
|
||||
c.Check(list.Len(), Equals, 4)
|
||||
c.Check(list.Add(s.p4), ErrorMatches, "conflict in package.*")
|
||||
|
||||
list, err = NewPackageListFromRefList(nil, coll)
|
||||
c.Assert(err, IsNil)
|
||||
c.Check(list.Len(), Equals, 0)
|
||||
}
|
||||
|
||||
func (s *PackageListSuite) TestNewPackageRefList(c *C) {
|
||||
|
||||
Reference in new issue
Block a user