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

general.py formatting

This commit is contained in:
Dylan Taylor 2021-05-15 12:56:14 -04:00
parent 658e5c0411
commit e966bef891
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
archinstall/lib/general.py
View File

@ -17,6 +17,7 @@ from .output import log
def gen_uid(entropy_length=256): def gen_uid(entropy_length=256):
return hashlib.sha512(os.urandom(entropy_length)).hexdigest() return hashlib.sha512(os.urandom(entropy_length)).hexdigest()
def multisplit(s, splitters): def multisplit(s, splitters):
s = [s, ] s = [s, ]
for key in splitters: for key in splitters:
@ -31,6 +32,7 @@ def multisplit(s, splitters):
s = ns s = ns
return s return s
def locate_binary(name): def locate_binary(name):
for PATH in os.environ['PATH'].split(':'): for PATH in os.environ['PATH'].split(':'):
for root, folders, files in os.walk(PATH): for root, folders, files in os.walk(PATH):
@ -39,6 +41,7 @@ def locate_binary(name):
return os.path.join(root, file) return os.path.join(root, file)
break # Don't recurse break # Don't recurse
class JSON_Encoder: class JSON_Encoder:
def _encode(obj): def _encode(obj):
if isinstance(obj, dict): if isinstance(obj, dict):
@ -73,6 +76,7 @@ class JSON_Encoder:
else: else:
return obj return obj
class JSON(json.JSONEncoder, json.JSONDecoder): class JSON(json.JSONEncoder, json.JSONDecoder):
def _encode(self, obj): def _encode(self, obj):
return JSON_Encoder._encode(obj) return JSON_Encoder._encode(obj)
@ -307,7 +311,9 @@ class sys_command():#Thread):
if self.exit_code != 0 and not self.kwargs['suppress_errors']: if self.exit_code != 0 and not self.kwargs['suppress_errors']:
# self.log(self.trace_log.decode('UTF-8'), level=logging.DEBUG) # self.log(self.trace_log.decode('UTF-8'), level=logging.DEBUG)
# self.log(f"'{self.raw_cmd}' did not exit gracefully, exit code {self.exit_code}.", level=logging.ERROR) # self.log(f"'{self.raw_cmd}' did not exit gracefully, exit code {self.exit_code}.", level=logging.ERROR)
raise SysCallError(message=f"{self.trace_log.decode('UTF-8')}\n'{self.raw_cmd}' did not exit gracefully (trace log above), exit code: {self.exit_code}", exit_code=self.exit_code) raise SysCallError(
message=f"{self.trace_log.decode('UTF-8')}\n'{self.raw_cmd}' did not exit gracefully (trace log above), exit code: {self.exit_code}",
exit_code=self.exit_code)
self.ended = time.time() self.ended = time.time()
with open(f'{self.cwd}/trace.log', 'wb') as fh: with open(f'{self.cwd}/trace.log', 'wb') as fh:
@ -325,5 +331,6 @@ def prerequisite_check():
return True return True
def reboot(): def reboot():
o = b''.join(sys_command("/usr/bin/reboot")) o = b''.join(sys_command("/usr/bin/reboot"))