From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Tue, 18 Mar 2025 23:50:31 +0000 (+1300)
Subject: samba-tool gpo: separate function for dtd header generation
X-Git-Tag: tevent-0.17.0~444
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea0c84b18ed5290c940de78a50dbd5664ab07ee7;p=thirdparty%2Fsamba.git

samba-tool gpo: separate function for dtd header generation

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/python/samba/netcmd/gpo.py b/python/samba/netcmd/gpo.py
index ada5f142a6f..d4f4604b16c 100644
--- a/python/samba/netcmd/gpo.py
+++ b/python/samba/netcmd/gpo.py
@@ -1633,14 +1633,10 @@ class cmd_restore(cmd_create):
                             self.outf.write('WARNING: Error during parsing for %s\n' % l_name)
                             self.outf.write('WARNING: Falling back to simple copy-restore.\n')
 
-    def run(self, displayname, backup, H=None, tmpdir=None, entities=None, sambaopts=None, credopts=None,
-            versionopts=None, restore_metadata=None):
-
+    @staticmethod
+    def generate_dtd_header(entities):
         dtd_header = ''
 
-        if not os.path.exists(backup):
-            raise CommandError("Backup directory does not exist %s" % backup)
-
         if entities is not None:
             # DOCTYPE name is meant to match root element, but ElementTree does
             # not seem to care, so this seems to be enough.
@@ -1663,6 +1659,16 @@ class cmd_restore(cmd_create):
 
             dtd_header += '\n]>\n'
 
+        return dtd_header
+
+    def run(self, displayname, backup, H=None, tmpdir=None, entities=None, sambaopts=None, credopts=None,
+            versionopts=None, restore_metadata=None):
+
+        if not os.path.exists(backup):
+            raise CommandError("Backup directory does not exist %s" % backup)
+
+        dtd_header = self.generate_dtd_header(entities)
+
         super().run(displayname, H, tmpdir, sambaopts, credopts, versionopts)
 
         try: