vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: Handle excludes or includes explicitly

Browse source 
* Take backup only if doctype exists
* Show mysql command only if verbose is passed
This commit is contained in:
Gavin D'souza 2020-09-24 11:34:43 +05:30
parent 6cb6a18b48
commit bb2a1910e8
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
frappe/utils/backups.py
View file

@ -76,10 +76,11 @@ class BackupGenerator:
def setup_backup_tables(self):
"""Sets self.backup_includes, self.backup_excludes based on passed args
"""
existing_doctypes = set([x.name for x in frappe.get_all("DocType")])
def get_tables(doctypes):
tables = []
for doctype in doctypes:
if doctype:
if doctype and doctype in existing_doctypes:
if doctype.startswith("tab"):
tables.append(doctype)
else:
@ -98,7 +99,7 @@ class BackupGenerator:
self.backup_includes = passed_tables["include"]
self.backup_excludes = passed_tables["exclude"]
if not self.ignore_conf:
if not (self.backup_includes or self.backup_excludes) and not self.ignore_conf:
self.backup_includes = self.backup_includes or conf_tables["include"]
self.backup_excludes = self.backup_excludes or conf_tables["exclude"]
@ -239,7 +240,6 @@ class BackupGenerator:
else:
if self.backup_includes:
args["include"] = " ".join(["'{0}'".format(x) for x in self.backup_includes])
elif self.backup_excludes:
args["exclude"] = " ".join(["--ignore-table='{0}.{1}'".format(frappe.conf.db_name, table) for table in self.backup_excludes])
@ -256,7 +256,8 @@ class BackupGenerator:
include=args.get('include', '')
)
print(command)
if self.verbose:
print(command)
err, out = frappe.utils.execute_in_shell(command)