summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Sargent <philip.sargent@klebos.com>2022-10-07 23:47:30 +0300
committerPhilip Sargent <philip.sargent@klebos.com>2022-10-07 23:47:30 +0300
commit74b314707603ac384d542d32ba810eb0e640b2f5 (patch)
tree714a0944e000656f8aff6c75a3b3df7119a8e851
parentf51d1e114e57d652025d5e0630c22dbc85eb4707 (diff)
downloadtroggle-74b314707603ac384d542d32ba810eb0e640b2f5.tar.gz
troggle-74b314707603ac384d542d32ba810eb0e640b2f5.tar.bz2
troggle-74b314707603ac384d542d32ba810eb0e640b2f5.zip
fix for running troggle not on master git server
-rw-r--r--core/utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/utils.py b/core/utils.py
index c7f71fa..b2140ed 100644
--- a/core/utils.py
+++ b/core/utils.py
@@ -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)