From 1c3970aab3c75a74691e6c4fc92b9ee1c92204ad Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Sun, 9 Feb 2020 13:11:26 +0500 Subject: [PATCH] bug fix: mail domain skip while restore --- .gitignore | 1 + plogical/backupUtilities.py | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/.gitignore b/.gitignore index 64dffcb6a..184684c84 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ .LSOverride *.pyc .idea +venv diff --git a/plogical/backupUtilities.py b/plogical/backupUtilities.py index 71b279993..1ddc0ffdc 100755 --- a/plogical/backupUtilities.py +++ b/plogical/backupUtilities.py @@ -628,6 +628,16 @@ class backupUtilities: for childDomain in childDomains: domain = childDomain.find('domain').text + + ## mail domain check + + mailDomain = 'mail.%s' % (masterDomain) + + if domain == mailDomain: + continue + + ## Mail domain check + phpSelection = childDomain.find('phpSelection').text path = childDomain.find('path').text @@ -668,6 +678,7 @@ class backupUtilities: continue else: + logging.CyberCPLogFileWriter.writeToFile('Error domain %s' % (domain)) logging.CyberCPLogFileWriter.statusWriter(status, "Error Message: " + retValues[1] + ". Not able to create child domains, aborting. [635][5009]") return 0 except BaseException as msg: