sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-12-23 00:23:53 +03:00
Code Activity

samba-tool gpo: separate function for dtd header generation

Browse Source 
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Douglas Bagnall
2025-03-19 12:50:31 +13:00
committed by Ralph Boehme
parent 2f2dac3094
commit ea0c84b18e
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
python/samba/netcmd/gpo.py
View File

@@ -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: