Skip to content

Commit bd2eba0

Browse files
committed
pkgdev commit: use tuples instead of OrderedFrozenSet for change lists
Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
1 parent 8105fee commit bd2eba0

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

‎src/pkgdev/scripts/pkgdev_commit.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
from snakeoil.cli import arghparse
2828
from snakeoil.cli.input import userquery
2929
from snakeoil.klass import jit_attr
30-
from snakeoil.mappings import OrderedFrozenSet, OrderedSet
30+
from snakeoil.mappings import OrderedSet
3131

3232
from .. import cli, git
3333
from ..mangle import GentooMangler, Mangler
@@ -700,18 +700,18 @@ def _generate_mapping(self):
700700

701701
@jit_attr
702702
def all(self):
703-
"""Ordered set of all change objects."""
704-
return OrderedFrozenSet(chain.from_iterable(self.data.values()))
703+
"""All change objects, in order, without duplicates."""
704+
return tuple(dict.fromkeys(chain.from_iterable(self.data.values())))
705705

706706
@jit_attr
707707
def pkg_changes(self):
708-
"""Ordered set of all package change objects."""
709-
return OrderedFrozenSet(self.data.get(PkgChange, ()))
708+
"""All package change objects, in order, without duplicates."""
709+
return tuple(dict.fromkeys(self.data.get(PkgChange, ())))
710710

711711
@jit_attr
712712
def ebuild_changes(self):
713-
"""Ordered set of all ebuild change objects."""
714-
return OrderedFrozenSet(x for x in self.pkg_changes if x.ebuild)
713+
"""All ebuild change objects, in order."""
714+
return tuple(x for x in self.pkg_changes if x.ebuild)
715715

716716
@jit_attr
717717
def prefix(self):

0 commit comments

Comments
 (0)