diff options
Diffstat (limited to 'core/views/expo.py')
| -rw-r--r-- | core/views/expo.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/core/views/expo.py b/core/views/expo.py index 6c79771..8b3e27e 100644 --- a/core/views/expo.py +++ b/core/views/expo.py @@ -318,12 +318,17 @@ def editexpopage(request, path): # see also core/models/cave.py writetrogglefile() f.write(result) # should replace .call with .run and capture_output=True - subprocess.call([git, "add", filename], cwd=cwd) - subprocess.call([git, "commit", "-m", 'Edit this page'], 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 SubprocessError: + + try: + cp1 = subprocess.run([git, "add", filename], cwd=cwd, capture_output=True) + cp2 = subprocess.run([git, "commit", "-m", 'Edit this page'], cwd=cwd, capture_output=True) + message = f'Test output this file {filename}. git command output.\n' + str(cp1) + '\n\n' + str(cp2) + return render(request,'errors/debug.html', {'message': message}) + + except subprocess.SubprocessError: 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}) |