Merge branch 'hg'

Author: jakub-horak

.hgtags

@@ -497,3 +497,4 @@ b1bb202dfa4679d5c482b66385caf99eb1778654 st190
 0000000000000000000000000000000000000000 st190
 0000000000000000000000000000000000000000 st190
 da5d68806e4acacc7259e6a1dc6a07b9232e3443 st190
+77a22afac056e605034ea6293762821d733e01d5 st191

src/tests/cli/t_pkgdiff.py

@@ -286,15 +286,15 @@ def test_03_hash(self):
 file path=bin/true elfarch=i386 elfbits=32 elfhash=efgh
  - pkg.content-hash=file:sha512t_256:ijkl
  + pkg.content-hash=file:sha512t_256:mnop
-file path=etc/hosts 
+file path=etc/hosts
  - abcd
  + efgh
-file path=etc/motd 
+file path=etc/motd
  - 4ab5de3107a63f5cf454485f720cac025f1b7002
  + 3aba408bd383553aa84bba4fefe8495239927763
  - chash=dc03afd488e3b3e4c4993d2403d7e15603b0a391
  + chash=f0c2aa47dce2ba0132efdace8d3b88b6589767f3
-file path=etc/passwd 
+file path=etc/passwd
  - pkg.content-hash=file:sha512t_256:abcd
  + pkg.content-hash=file:sha512t_256:efgh
 """
@@ -311,15 +311,15 @@ def test_03_hash(self):
  + bar
  - pkg.content-hash=gelf.unsigned:sha512t_256:abcd pkg.content-hash=gelf:sha512t_256:abcd
  + pkg.content-hash=gelf.unsigned:sha512t_256:efgh pkg.content-hash=gelf:sha512t_256:efgh
-file path=etc/hosts 
+file path=etc/hosts
  - abcd
  + efgh
-file path=etc/motd 
+file path=etc/motd
  - 4ab5de3107a63f5cf454485f720cac025f1b7002
  + 3aba408bd383553aa84bba4fefe8495239927763
  - chash=dc03afd488e3b3e4c4993d2403d7e15603b0a391
  + chash=f0c2aa47dce2ba0132efdace8d3b88b6589767f3
-file path=etc/passwd 
+file path=etc/passwd
  - pkg.content-hash=file:sha512t_256:abcd
  + pkg.content-hash=file:sha512t_256:efgh
 """
@@ -336,10 +336,10 @@ def test_03_hash(self):
 file path=bin/ls elfarch=i386 elfbits=32 elfhash=abcd
  - foo
  + bar
-file path=etc/hosts 
+file path=etc/hosts
  - abcd
  + efgh
-file path=etc/motd 
+file path=etc/motd
  - 4ab5de3107a63f5cf454485f720cac025f1b7002
  + 3aba408bd383553aa84bba4fefe8495239927763
 """
@@ -357,7 +357,7 @@ def test_03_hash(self):
         self.pkgdiff(" ".join(("-t license", self.hashed20_p5m,
             self.hashed10_p5m)), exit=1)
         expected = """\
-license license=lic_OTN 
+license license=lic_OTN
  - 7ab6de3107a63f5cf454485f720cac025f1b7001
  + 6aba708bd383553aa84bba4fefe8495239927767
  - chash=cc05afd488e3b3e4c4993d2403d7e15603b0a398
@@ -370,7 +370,7 @@ def test_03_hash(self):
         self.pkgdiff(" ".join(("-t license -o hash", self.hashed20_p5m,
             self.hashed10_p5m)), exit=1)
         expected = """\
-license license=lic_OTN 
+license license=lic_OTN
  - 7ab6de3107a63f5cf454485f720cac025f1b7001
  + 6aba708bd383553aa84bba4fefe8495239927767
 """

src/util/publish/pkgdiff.py

@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright (c) 2009, 2024, Oracle and/or its affiliates.
+# Copyright (c) 2009, 2025, Oracle and/or its affiliates.
 #
 
 try:
@@ -317,29 +317,28 @@ def conditional_print(s, a):
         elif not old:
             different |= conditional_print("+", new)
         else:
-            s = []
+            output = []
 
             if not onlyattrs:
-                if (hasattr(old, "hash") and
-                    "hash" not in ignoreattrs):
+                if hasattr(old, "hash") and "hash" not in ignoreattrs:
                     if old.hash != new.hash:
-                        s.append("  - {0}".format(old.hash))
-                        s.append("  + {0}".format(new.hash))
-                attrdiffs = (set(new.differences(old)) -
-                    ignoreattrs)
-                attrsames = sorted( list(set(list(old.attrs.keys()) +
-                    list(new.attrs.keys())) -
-                    set(new.differences(old))))
+                        output.append(f"  - {old.hash}")
+                        output.append(f"  + {new.hash}")
+                attrdiffs = set(new.differences(old)) - ignoreattrs
             else:
                 if hasattr(old, "hash") and "hash" in onlyattrs:
                     if old.hash != new.hash:
-                        s.append("  - {0}".format(old.hash))
-                        s.append("  + {0}".format(new.hash))
-                attrdiffs = (set(new.differences(old)) &
-                    onlyattrs)
-                attrsames = sorted(list(set(list(old.attrs.keys()) +
-                    list(new.attrs.keys())) -
-                    set(new.differences(old))))
+                        output.append(f"  - {old.hash}")
+                        output.append(f"  + {new.hash}")
+                attrdiffs = set(new.differences(old)) & onlyattrs
+
+            # sort attributes by name and put the key attribute first
+            attrsames = sorted(
+                set(old.attrs)
+                .union(new.attrs)
+                .difference(new.differences(old)),
+                key=lambda val: "" if val == old.key_attr else val
+            )
 
             for a in sorted(attrdiffs):
                 if a in old.attrs and a in new.attrs and \
@@ -350,25 +349,21 @@ def conditional_print(s, a):
                 else:
                     elide_set = set()
                 if a in old.attrs:
-                    diff_str = attrval(old.attrs, a,
-                        elide_iter=elide_set)
+                    diff_str = attrval(old.attrs, a, elide_iter=elide_set)
                     if diff_str:
-                        s.append("  - {0}".format(diff_str))
+                        output.append(f"  - {diff_str}")
                 if a in new.attrs:
-                    diff_str = attrval(new.attrs, a,
-                        elide_iter=elide_set)
+                    diff_str = attrval(new.attrs, a, elide_iter=elide_set)
                     if diff_str:
-                        s.append("  + {0}".format(diff_str))
-            # print out part of action that is the same
-            if s:
+                        output.append(f"  + {diff_str}")
+            if output:
                 different = True
-                print("{0} {1} {2}".format(old.name,
-                    attrval(old.attrs, old.key_attr),
-                    " ".join(("{0}".format(attrval(old.attrs, v))
-                    for v in attrsames if v != old.key_attr))))
 
-                for l in s:
-                    print(l)
+                # print out part of action that is the same
+                attrs = ' '.join(attrval(old.attrs, val) for val in attrsames)
+                print(f"{old.name} {attrs}")
+                # and then all the differences
+                print("\n".join(output))
 
     return int(different)