From 84e165b8fc17dfa924b549ccd2ad16e2013a596b Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Thu, 30 Dec 2021 19:28:33 +0000 Subject: Move exception handling to calling View --- core/models/caves.py | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'core/models/caves.py') diff --git a/core/models/caves.py b/core/models/caves.py index 4d2e0a9..263eaf1 100644 --- a/core/models/caves.py +++ b/core/models/caves.py @@ -45,19 +45,13 @@ def writetrogglefile(filepath, filecontent): filename = filepath.name git = settings.GIT - try: - with open(filepath, "w") as f: - os.chmod(filepath, 0o664) # set file permissions to rw-rw-r-- - f.write(filecontent) - print(f'WRITING{cwd}---{filename} ') - call([git, "add", filename], cwd=cwd) - call([git, "commit", "-m", 'Online cave or entrance edit'], cwd=cwd) - except PermissionError: - message = f'CANNOT save this file.\nPERMISSIONS incorrectly set on server for this file {filename}. Ask a nerd to fix this.' - return render(request,'errors/generic.html', {'message': message}) - except: - message = f'CANNOT git on server for this file {filename}. Edits not saved.\nAsk a nerd to fix this.' - return render(request,'errors/generic.html', {'message': message}) + # do not trap exceptions, pass them up to the view that called this function + with open(filepath, "w") as f: + os.chmod(filepath, 0o664) # set file permissions to rw-rw-r-- + f.write(filecontent) + print(f'WRITING{cwd}---{filename} ') + call([git, "add", filename], cwd=cwd) + call([git, "commit", "-m", 'Online cave or entrance edit'], cwd=cwd) class Area(TroggleModel): -- cgit v1.2.3