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

samba-tool domain backup: fix py2.6 incompatible format

Browse Source 
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Wed Sep 26 10:40:49 CEST 2018 on sn-devel-144
This commit is contained in:
Douglas Bagnall
2018-09-21 11:26:35 +12:00
committed by Andrew Bartlett
parent 4e592c9167
commit 36cb85be72
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
python/samba/netcmd/domain_backup.py
View File

@@ -105,7 +105,7 @@ def get_timestamp():
def backup_filepath(targetdir, name, time_str):
filename = 'samba-backup-{}-{}.tar.bz2'.format(name, time_str)
filename = 'samba-backup-%s-%s.tar.bz2' % (name, time_str)
return os.path.join(targetdir, filename)
@@ -164,9 +164,9 @@ def set_admin_password(logger, samdb):
# match the admin user by RID
domainsid = samdb.get_domain_sid()
match_admin = "(objectsid={}-{})".format(domainsid,
security.DOMAIN_RID_ADMINISTRATOR)
search_expr = "(&(objectClass=user){})".format(match_admin)
match_admin = "(objectsid=%s-%s)" % (domainsid,
security.DOMAIN_RID_ADMINISTRATOR)
search_expr = "(&(objectClass=user)%s)" % (match_admin,)
# retrieve the admin username (just in case it's been renamed)
res = samdb.search(base=samdb.domain_dn(), scope=ldb.SCOPE_SUBTREE,
@@ -850,7 +850,7 @@ class cmd_domain_backup_offline(samba.netcmd.Command):
raise e
raise copy_err
if not os.path.exists(backup_path):
s = "tdbbackup said backup succeeded but {} not found"
s = "tdbbackup said backup succeeded but {0} not found"
raise CommandError(s.format(backup_path))
def offline_mdb_copy(self, path):
@@ -941,7 +941,7 @@ class cmd_domain_backup_offline(samba.netcmd.Command):
backup_dirs = [paths.private_dir, paths.state_dir,
os.path.dirname(paths.smbconf)] # etc dir
logger.info('running backup on dirs: {}'.format(' '.join(backup_dirs)))
logger.info('running backup on dirs: {0}'.format(' '.join(backup_dirs)))
# Recursively get all file paths in the backup directories
all_files = []
@@ -1026,8 +1026,9 @@ class cmd_domain_backup_offline(samba.netcmd.Command):
tar.add(path, arcname=arc_path)
tar.close()
os.rename(temp_tar_name, os.path.join(targetdir,
'samba-backup-{}.tar.bz2'.format(time_str)))
os.rename(temp_tar_name,
os.path.join(targetdir,
'samba-backup-{0}.tar.bz2'.format(time_str)))
os.rmdir(temp_tar_dir)
logger.info('Backup succeeded.')