From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Fri, 14 Mar 2025 08:55:29 +0000 (+1300)
Subject: samba-tool gpo backup fix --generalize
X-Git-Tag: samba-4.22.1~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16defe083869a3134a6e65430baa84e64f4e9f57;p=thirdparty%2Fsamba.git

samba-tool gpo backup fix --generalize

This was broken with commit ce56d336f234febfd4cb3da11dd584842c24ce1d
but we didn't notice because the test was already broken.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15829

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
(cherry picked from commit 65751f2562f98bd7fd0734dc00784e6395d76322)
---

diff --git a/python/samba/netcmd/gpo.py b/python/samba/netcmd/gpo.py
index d4f6bad67af..12fc2c6c409 100644
--- a/python/samba/netcmd/gpo.py
+++ b/python/samba/netcmd/gpo.py
@@ -1322,9 +1322,11 @@ class cmd_backup(GPOCommand):
             self.outf.write('\nAttempting to generalize XML entities:\n')
             entities = cmd_backup.generalize_xml_entities(self.outf, gpodir,
                                                           gpodir)
-            import operator
-            ents = "".join('<!ENTITY {} "{}\n">'.format(ent[1].strip('&;'), ent[0]) \
-                             for ent in sorted(entities.items(), key=operator.itemgetter(1)))
+
+            ent_list = [(v, k) for k, v in entities.items()]
+            ent_list.sort()
+            ents = "".join(f'<!ENTITY {ent.strip("&;")} "{val}">\n'
+                           for ent, val in ent_list)
 
             if ent_file:
                 with open(ent_file, 'w') as f:
diff --git a/selftest/knownfail.d/samba-tool-gpo b/selftest/knownfail.d/samba-tool-gpo
deleted file mode 100644
index 097495bba08..00000000000
--- a/selftest/knownfail.d/samba-tool-gpo
+++ /dev/null
@@ -1,2 +0,0 @@
-^samba.tests.samba_tool.gpo.+GpoCmdTestCase.test_backup_restore_generalize
-