diff --git a/IncBackups/views.py b/IncBackups/views.py index b45874088..f3d9b80ec 100644 --- a/IncBackups/views.py +++ b/IncBackups/views.py @@ -721,7 +721,6 @@ def ConfigureV2Backup(request): if ACLManager.currentContextPermission(current_acl, 'createBackup') == 0: return ACLManager.loadError() - if ACLManager.CheckForPremFeature('all'): BackupStat = 1 else: @@ -1029,9 +1028,6 @@ def selectwebsiteCreatev2(request): return HttpResponse(final_json) - - - # logging.writeToFile(str(CurrentContent)) # final_json = json.dumps({'status': 1, 'fetchStatus': 1, 'error_message': "None", "data": None}) # return HttpResponse(final_json) diff --git a/dockerManager/container.py b/dockerManager/container.py index 67b20a098..9364daf5a 100755 --- a/dockerManager/container.py +++ b/dockerManager/container.py @@ -137,6 +137,7 @@ class ContainerManager(multi.Thread): client = docker.from_env() dockerAPI = docker.APIClient() + try: container = client.containers.get(name) except docker.errors.NotFound as err: diff --git a/plogical/Backupsv2.py b/plogical/Backupsv2.py index ffd1130ae..7c28af472 100644 --- a/plogical/Backupsv2.py +++ b/plogical/Backupsv2.py @@ -634,7 +634,7 @@ team_drive = ## Pending add user provided folders in the exclude list - exclude = f' --exclude-if-present rusticbackup --exclude-if-present logs ' + exclude = f' --exclude-if-present {source}/logs ' command = f'rustic -r {self.repo} backup {source} --password "" {exclude} --json 2>/dev/null' result = json.loads(ProcessUtilities.outputExecutioner(command, self.website.externalApp, True).rstrip('\n'))