diff --git a/IncBackups/IncBackupsControl.py b/IncBackups/IncBackupsControl.py index 815c02f73..9534734a7 100644 --- a/IncBackups/IncBackupsControl.py +++ b/IncBackups/IncBackupsControl.py @@ -683,6 +683,7 @@ class IncJobs(multi.Thread): except BaseException as msg: logging.statusWriter(self.statusPath, 'Failed to delete database: %s. [IncJobs.backupDatabases.456]' % str(msg), 1) + return 1 except BaseException as msg: logging.statusWriter(self.statusPath, '%s. [IncJobs.backupDatabases.269][5009]' % str(msg), 1) diff --git a/websiteFunctions/templates/websiteFunctions/manageGIT.html b/websiteFunctions/templates/websiteFunctions/manageGIT.html index d8558cc46..5b0afc6c9 100755 --- a/websiteFunctions/templates/websiteFunctions/manageGIT.html +++ b/websiteFunctions/templates/websiteFunctions/manageGIT.html @@ -862,9 +862,7 @@
diff --git a/websiteFunctions/website.py b/websiteFunctions/website.py index 42c51789a..450cdf14a 100755 --- a/websiteFunctions/website.py +++ b/websiteFunctions/website.py @@ -3895,7 +3895,13 @@ StrictHostKeyChecking no command = 'git -C %s diff-tree --no-commit-id --name-only -r %s' % (self.folder, self.commit) files = ProcessUtilities.outputExecutioner(command, self.externalApp).split('\n') - data_ret = {'status': 1, 'files': files} + FinalFiles = [] + + for items in files: + if items != '': + FinalFiles.append(items.rstrip('\n').lstrip('\n')) + + data_ret = {'status': 1, 'files': FinalFiles} json_data = json.dumps(data_ret) return HttpResponse(json_data)