mangle: use pkgcore's sort_keywords

Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>

Author: arthurzam

src/pkgdev/mangle.py

@@ -8,6 +8,7 @@
 import traceback
 from datetime import datetime
 
+from pkgcore.ebuild.misc import sort_keywords
 from snakeoil.cli.exceptions import UserException
 from snakeoil.mappings import OrderedSet
 
@@ -71,15 +72,10 @@ def _eof(self, change):
     @mangle("keywords")
     def _keywords(self, change):
         """Fix keywords order."""
-
-        def keywords_sort_key(kw):
-            return tuple(reversed(kw.lstrip("-~").partition("-")))
-
         lines = change.data.splitlines()
         for i, line in enumerate(lines):
             if mo := keywords_regex.match(line):
-                kw = sorted(mo.group("keywords").split(), key=keywords_sort_key)
-                new_kw = " ".join(kw)
+                new_kw = " ".join(sort_keywords(mo.group("keywords").split()))
                 if not mo.group("quote"):
                     new_kw = f'"{new_kw}"'
                 lines[i] = f"{mo.group('pre')}{new_kw}{mo.group('post')}"

tests/test_mangle.py

@@ -52,6 +52,22 @@ def test_mangled_file(self, tmp_path):
         assert list(Mangler([fake_change(path)])) == [str(path)]
         assert path.read_text() == "# comment\n"
 
+    @pytest.mark.parametrize(
+        ("original", "expected"),
+        (
+            # glob-arches first, then arches, then prefix-arches
+            ('KEYWORDS="~x86-macos amd64 -* ~alpha"', '"-* ~alpha amd64 ~x86-macos"'),
+            # unquoted keywords gain quotes
+            ("KEYWORDS=sparc", '"sparc"'),
+            ("KEYWORDS='sparc ~arm64 alpha'", "'alpha ~arm64 sparc'"),
+        ),
+    )
+    def test_keywords_order(self, tmp_path, original, expected):
+        path = tmp_path / "pkg-1.ebuild"
+        path.write_text(f"# comment\n{original}\n")
+        assert list(Mangler([fake_change(path)])) == [str(path)]
+        assert path.read_text() == f"# comment\nKEYWORDS={expected}\n"
+
     def test_iterator_exceptions(self, tmp_path):
         """Test parallelized iterator against unhandled exceptions."""
         path = tmp_path / "file"