mirror of
https://expo.survex.com/repositories/troggle/.git
synced 2024-11-21 23:01:52 +00:00
fix for running troggle not on master git server
This commit is contained in:
parent
f51d1e114e
commit
74b3147076
@ -96,7 +96,7 @@ nothing to commit, working tree clean
|
||||
if cp_commit.returncode == 1 and cp_commit.stdout == devok_text:
|
||||
pass
|
||||
else:
|
||||
if cp_commit.returncode != 0 and cp_commit.stdout != 'nothing to commit, working tree clean':
|
||||
if cp_commit.returncode != 0 and not cp_commit.stdout.strip().endswith('nothing to commit, working tree clean'):
|
||||
msgdata = f'--Ask a nerd to fix this problem in only_commit().\n--{cp_commit.stderr}\n--"{cp_commit.stdout}"\n--return code:{str(cp_commit.returncode)}'
|
||||
print(msgdata)
|
||||
raise WriteAndCommitError(f'Error code with git on server for this file {filename}. Edits saved, added to git, but NOT committed.\n\n' + msgdata)
|
||||
|
Loading…
Reference in New Issue
Block a user