From 41c68aef26437e865f356ab13f4715c5da490764 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Tue, 16 Aug 2022 20:02:28 +0300 Subject: detecting empty wallets where we only have JSON and no files --- core/views/uploads.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'core/views/uploads.py') diff --git a/core/views/uploads.py b/core/views/uploads.py index 3a7e67b..490b432 100644 --- a/core/views/uploads.py +++ b/core/views/uploads.py @@ -1,4 +1,4 @@ -import re, os +import re, os, socket import subprocess import json import settings @@ -270,7 +270,10 @@ def scanupload(request, path=None): print(message) return render(request,'errors/generic.html', {'message': message}) else: - dr_commit = subprocess.run([git, "commit", "-m", f'JSON update for wallet {wallet}'], cwd=destfolder, capture_output=True, text=True) + if socket.gethostname() != "expo": + comment = f"on dev machine '{socket.gethostname()}' " + + dr_commit = subprocess.run([git, "commit", "-m", f'JSON update for wallet {wallet} {comment}'], cwd=destfolder, capture_output=True, text=True) # This produces return code = 1 if it commits OK if dr_commit.returncode != 0: msgdata = 'Ask a nerd to fix this.\n\n' + dr_commit.stderr + '\n\n' + dr_commit.stdout + '\n\nreturn code: ' + str(dr_commit.returncode) @@ -441,6 +444,7 @@ def scanupload(request, path=None): chkpland = "" svxfiles = [] checked = {} + context = {} if waldata: if not waldata["people"]: waldata["people"]=["NOBODY"] -- cgit v1.2.3