diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/utils.py | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/core/utils.py b/core/utils.py index 66e0bdc..38ae026 100644 --- a/core/utils.py +++ b/core/utils.py @@ -145,22 +145,21 @@ def write_and_commit(files, message): else: print(f"No change {filepath}") subprocess.run([git, "commit", filename, "-m", message], cwd=cwd, capture_output=True, text=True) - #cp_status = subprocess.run([git, "status"], cwd=cwd, capture_output=True, text=True) - # This produces return code = 1 if it commits OK, but when the repo still needs to be pushed to origin/expoweb - #if cp_status.stdout.split("\n")[-2] != "nothing to commit, working tree clean": - # print("FOO: ", cp_status.stdout.split("\n")[-2]) - # msgdata = ( - # "Ask a nerd to fix this.\n\n" - # + cp_status.stderr - # + "\n\n" - # + cp_status.stdout - # + "\n\nreturn code: " - # + str(cp_status.returncode) - # ) - # raise WriteAndCommitError( - # f"Error code with git on server for this file {filename}. Edits saved, added to git, but NOT committed.\n\n" - # + msgdata - # ) + cp_status = subprocess.run([git, "status", filename], cwd=cwd, capture_output=True, text=True) + #This produces return code = 1 if it commits OK, but when the repo still needs to be pushed to origin/expoweb + if cp_status.stdout.split("\n")[-2] != "nothing to commit, working tree clean": + msgdata = ( + "Ask a nerd to fix this.\n\n" + + cp_status.stderr + + "\n\n" + + cp_status.stdout + + "\n\nreturn code: " + + str(cp_status.returncode) + ) + raise WriteAndCommitError( + f"Error code with git on server for this file {filename}. Edits saved, added to git, but NOT committed.\n\n" + + msgdata + ) except subprocess.SubprocessError: raise WriteAndCommitError( f"CANNOT git on server for this file {filename}. Subprocess error. Edits not saved.\nAsk a nerd to fix this." |