From 77c30609a9fb7fe2557f443a27132b5d460007c7 Mon Sep 17 00:00:00 2001 From: topilski Date: Thu, 12 Mar 2020 09:38:30 -0400 Subject: [PATCH] Sync --- pyfastogt/exe/request_fastogt_license_key | 6 +++++- pyfastogt/utils.py | 9 +++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/pyfastogt/exe/request_fastogt_license_key b/pyfastogt/exe/request_fastogt_license_key index 945e2d1..60c468d 100755 --- a/pyfastogt/exe/request_fastogt_license_key +++ b/pyfastogt/exe/request_fastogt_license_key @@ -46,7 +46,11 @@ if __name__ == "__main__": json={'email': argv.email, 'license': argv.license_key, 'project': argv.project, 'exp_time': expired_time}) - response = r.json() + try: + response = r.json() + except: + response = {'error': 'Invalid response'} + if r.status_code == 200 or r.status_code == 201: print(response['exp_license']) sys.exit(0) diff --git a/pyfastogt/utils.py b/pyfastogt/utils.py index 8bdd054..36de127 100644 --- a/pyfastogt/utils.py +++ b/pyfastogt/utils.py @@ -7,6 +7,7 @@ import tarfile import json import ssl import certifi +import contextlib from validate_email import validate_email from urllib.request import urlopen @@ -176,3 +177,11 @@ def binary_search_impl(number, array, lo, hi): def binary_search_number(anum, array): # convenience interface to binary_search() return binary_search_impl(anum, array, 0, len(array) - 1) + + +def regenerate_dbus_machine_id(): + with contextlib.suppress(FileNotFoundError): + os.remove('/var/lib/dbus/machine-id') + with contextlib.suppress(FileNotFoundError): + os.remove('/etc/machine-id') + subprocess.call(['dbus-uuidgen', '--ensure'])