From c0d80e8727f2e6a13558293c5a9f34cdc4174c3e Mon Sep 17 00:00:00 2001 From: Alan Mason <1923621+2Shirt@users.noreply.github.com> Date: Thu, 30 Nov 2017 09:59:00 -0800 Subject: [PATCH] Updated error message --- .bin/Scripts/functions/common.py | 5 +---- .bin/Scripts/settings/main.py | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.bin/Scripts/functions/common.py b/.bin/Scripts/functions/common.py index 4697cfa7..c0899c21 100644 --- a/.bin/Scripts/functions/common.py +++ b/.bin/Scripts/functions/common.py @@ -202,14 +202,11 @@ def kill_process(name): def major_exception(): """Display traceback and exit""" print_error('Major exception') - print_warning( - " Please let {tech} know and they'll look into it" - " (include the details below).".format(tech=SUPPORT_TECH)) + print_warning(SUPPORT_MESSAGE) print(traceback.format_exc()) print_log(traceback.format_exc()) sleep(30) pause('Press Enter to exit...') - # sys.exit(1) exit_script(1) def menu_select(title='~ Untitled Menu ~', diff --git a/.bin/Scripts/settings/main.py b/.bin/Scripts/settings/main.py index 832719f8..fc5331a2 100644 --- a/.bin/Scripts/settings/main.py +++ b/.bin/Scripts/settings/main.py @@ -10,7 +10,7 @@ KIT_NAME_FULL='Wizard Kit' KIT_NAME_SHORT='WK' OFFICE_SERVER_IP='10.0.0.10' QUICKBOOKS_SERVER_IP='10.0.0.10' -SUPPORT_TECH='2Shirt' +SUPPORT_MESSAGE='Please let 2Shirt know by opening an issue on GitHub' TIME_ZONE='Pacific Standard Time' # Always use "Standard Time" (DST is applied correctly) # SERVER VARIABLES @@ -35,7 +35,7 @@ BACKUP_SERVERS = [ ] CLIENT_INFO_SERVER = { 'IP': '10.0.0.10', - 'RegEntry': r'0x10001,0xcc674aebbd889f5fd553564adcf3cab550791eca12542033d52134db893c95aabb6b318a4621d8116f6838d873edfe9db4509e1dfc9177ee7484808a62cbc42b913387f694fd67e81950f85198acf721c5767b54db7b864d69cce65e12c78c87d0fb4fc54996609c9b9274b1de7bae2f95000c9ca8d7e3f9b3f2cdb21cd578adf9ba98d10400a8203bb1a879a4cd2fad99baeb12738b9b4b99fec821f881acb62598a43c059f74af287bc8dceeb4821317aa44e2e0ee66d346927a654c702854a71a2eaed6a53f6be9360c7049974a2597a548361da42ac982ae55f993700a8b1fc9f3b4458314fbd41f239de0a29716cdcefbbb2c8d02b4c2effa4163cfeac9', + 'RegEntry': r'0x10001,0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000', 'Share': '/srv/ClientInfo', 'User': 'upload', }