Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall.py
diff options
context:
space:
mode:
authorAnton Hvornum <anton.feeds+github@gmail.com>2019-11-13 22:00:32 +0000
committerAnton Hvornum <anton.feeds+github@gmail.com>2019-11-13 22:00:32 +0000
commit1d06491e42a74a4013325f8e9a66549c9c8896e3 (patch)
tree1d423ea8d7436d25500636991a1f149e062bbe27 /archinstall.py
parent0ff066c813957d570f6561d59df6b3cf931536a8 (diff)
Moved the decoding logic for network data. - To the actual place where the network was executed.
Diffstat (limited to 'archinstall.py')
-rw-r--r--archinstall.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/archinstall.py b/archinstall.py
index b6fd9515..4d85c9ce 100644
--- a/archinstall.py
+++ b/archinstall.py
@@ -419,7 +419,7 @@ def grab_url_data(path):
def get_application_instructions(target):
instructions = {}
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))
except urllib.error.HTTPError:
print('[N] No instructions found for: {}'.format(target))
@@ -434,7 +434,7 @@ def get_application_instructions(target):
return instructions
try:
- instructions = json.loads(instructions.decode('UTF-8'), object_pairs_hook=oDict)
+ instructions = json.loads(instructions, object_pairs_hook=oDict)
except:
print('[E] JSON syntax error in {}'.format('{}/applications/{}.json'.format(args['profiles-path'], target)))
traceback.print_exc()
@@ -445,7 +445,7 @@ def get_application_instructions(target):
def get_instructions(target):
instructions = {}
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))
except urllib.error.HTTPError:
print('[N] No instructions found called: {}'.format(target))
@@ -460,7 +460,7 @@ def get_instructions(target):
return instructions
try:
- instructions = json.loads(instructions.decode('UTF-8'), object_pairs_hook=oDict)
+ instructions = json.loads(instructions, object_pairs_hook=oDict)
except:
print('[E] JSON syntax error in {}'.format('{}/{}.json'.format(args['profiles-path'], target)))
traceback.print_exc()