expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-12-12 03:22:18 +00:00
Code Issues 19 Projects 3 Activity

disambiguate error messages

Browse Source
This commit is contained in:
Philip Sargent 2024-12-10 19:06:52 +00:00
parent 26eff0172b
commit 700512c008
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/utils.py
View File

@ -298,7 +298,8 @@ def write_and_commit(files, message):
else: else:
print(f"No change {filepath}") print(f"No change {filepath}")
filepaths = [filepath for filepath, content, encoding in files] filepaths = [filepath for filepath, content, encoding in files]
cmd_commit = [git, "commit"] + filepaths + ["-m", message] message = message + " " + str(filepaths)
cmd_commit = [git, "commit", "-m", message]
cm_status = subprocess.run(cmd_commit, cwd=cwd, capture_output=True, text=True) cm_status = subprocess.run(cmd_commit, cwd=cwd, capture_output=True, text=True)
commands.append(cmd_commit) commands.append(cmd_commit)
if cm_status.returncode != 0: if cm_status.returncode != 0:
@ -315,7 +316,7 @@ def write_and_commit(files, message):
f"ERROR committing. Edits saved, [maybe] added to git, but NOT committed.\n\n" f"ERROR committing. Edits saved, [maybe] added to git, but NOT committed.\n\n"
+ msgdata + msgdata
) )
cmd_status = [git, "status"] + filepaths cmd_status = [git, "status"] # + filepaths
cp_status = subprocess.run(cmd_status, cwd=cwd, capture_output=True, text=True) cp_status = subprocess.run(cmd_status, cwd=cwd, capture_output=True, text=True)
commands.append(cp_status) commands.append(cp_status)
#This produces return code = 1 if it commits OK, but when the repo still needs to be pushed to origin/expoweb #This produces return code = 1 if it commits OK, but when the repo still needs to be pushed to origin/expoweb