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

Corrected recursion loop in log() calling log() before setting the new path for the log file on errors.

This commit is contained in:
Anton Hvornum 2021-03-23 11:42:12 +01:00
parent c5f6c4b712
commit aceb0f3e98
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
archinstall/lib/output.py
View File

@ -97,14 +97,15 @@ def log(*args, **kwargs):
absolute_logfile = os.path.join(storage.get('LOG_PATH', './'), filename) absolute_logfile = os.path.join(storage.get('LOG_PATH', './'), filename)
if not os.path.isfile(absolute_logfile): if not os.path.isfile(absolute_logfile):
try: try:
os.makedirs(os.path.dirname(absolute_logfile)) Path(absolute_logfile).parents[0].mkdir(exist_ok=True, parents=True)
except PermissionError: except PermissionError:
# Fallback to creating the log file in the current folder # Fallback to creating the log file in the current folder
log(f"Not enough permission to place log file at {absolute_logfile}, creating it in {Path('./').absolute()} instead.", fg="red") err_string = f"Not enough permission to place log file at {absolute_logfile}, creating it in {Path('./').absolute()/filename} instead."
absolute_logfile = Path('./').absolute()/filename absolute_logfile = Path('./').absolute()/filename
absolute_logfile.makedirs(exist_ok=True) absolute_logfile.parents[0].mkdir(exist_ok=True)
absolute_logfile = str(absolute_logfile)
storage['LOG_PATH'] = './' storage['LOG_PATH'] = './'
log(err_string, fg="red")
Path(absolute_logfile).touch() # Overkill? Path(absolute_logfile).touch() # Overkill?