RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Moved the decoding logic for network data. - To the actual place where the network was executed.

This commit is contained in:
Anton Hvornum 2019-11-13 22:00:32 +00:00
parent 0ff066c813
commit 1d06491e42
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
archinstall.py
View File

@ -419,7 +419,7 @@ def grab_url_data(path):
def get_application_instructions(target): def get_application_instructions(target):
instructions = {} instructions = {}
try: try:
instructions = grab_url_data('{}/applications/{}.json'.format(args['profiles-path'], target)) instructions = grab_url_data('{}/applications/{}.json'.format(args['profiles-path'], target)).decode('UTF-8')
print('[N] Found application instructions for: {}'.format(target)) print('[N] Found application instructions for: {}'.format(target))
except urllib.error.HTTPError: except urllib.error.HTTPError:
print('[N] No instructions found for: {}'.format(target)) print('[N] No instructions found for: {}'.format(target))
@ -434,7 +434,7 @@ def get_application_instructions(target):
return instructions return instructions
try: try:
instructions = json.loads(instructions.decode('UTF-8'), object_pairs_hook=oDict) instructions = json.loads(instructions, object_pairs_hook=oDict)
except: except:
print('[E] JSON syntax error in {}'.format('{}/applications/{}.json'.format(args['profiles-path'], target))) print('[E] JSON syntax error in {}'.format('{}/applications/{}.json'.format(args['profiles-path'], target)))
traceback.print_exc() traceback.print_exc()
@ -445,7 +445,7 @@ def get_application_instructions(target):
def get_instructions(target): def get_instructions(target):
instructions = {} instructions = {}
try: try:
instructions = grab_url_data('{}/{}.json'.format(args['profiles-path'], target)) instructions = grab_url_data('{}/{}.json'.format(args['profiles-path'], target)).decode('UTF-8')
print('[N] Found net-deploy instructions called: {}'.format(target)) print('[N] Found net-deploy instructions called: {}'.format(target))
except urllib.error.HTTPError: except urllib.error.HTTPError:
print('[N] No instructions found called: {}'.format(target)) print('[N] No instructions found called: {}'.format(target))
@ -460,7 +460,7 @@ def get_instructions(target):
return instructions return instructions
try: try:
instructions = json.loads(instructions.decode('UTF-8'), object_pairs_hook=oDict) instructions = json.loads(instructions, object_pairs_hook=oDict)
except: except:
print('[E] JSON syntax error in {}'.format('{}/{}.json'.format(args['profiles-path'], target))) print('[E] JSON syntax error in {}'.format('{}/{}.json'.format(args['profiles-path'], target)))
traceback.print_exc() traceback.print_exc()