Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall/lib
diff options
context:
space:
mode:
authorSecondThundeR <awayfromgalaxy@gmail.com>2021-04-27 15:14:28 +0300
committerSecondThundeR <awayfromgalaxy@gmail.com>2021-04-27 15:14:28 +0300
commit985b7fac3ff400de9954d441480ab795222f4b24 (patch)
tree2c9f18e362bad5650abbde7add125cb631aa4ebc /archinstall/lib
parentf5b6e7bafead1f604c27bfb31b84f3f560a682c8 (diff)
Revert "Update logging for some functions"
This reverts commit f5b6e7bafead1f604c27bfb31b84f3f560a682c8. Reverting commit due to currently redundant change and merge conflict
Diffstat (limited to 'archinstall/lib')
-rw-r--r--archinstall/lib/disk.py4
-rw-r--r--archinstall/lib/installer.py10
-rw-r--r--archinstall/lib/mirrors.py2
-rw-r--r--archinstall/lib/output.py4
-rw-r--r--archinstall/lib/user_interaction.py25
5 files changed, 26 insertions, 19 deletions
diff --git a/archinstall/lib/disk.py b/archinstall/lib/disk.py
index de93556a..bada4076 100644
--- a/archinstall/lib/disk.py
+++ b/archinstall/lib/disk.py
@@ -128,7 +128,7 @@ class BlockDevice():
@property
def uuid(self):
- log('BlockDevice().uuid is untested!', level=LOG_LEVELS.Warning, fg='yellow')
+ log(f'BlockDevice().uuid is untested!', level=LOG_LEVELS.Warning, fg='yellow')
"""
Returns the disk UUID as returned by lsblk.
This is more reliable than relying on /dev/disk/by-partuuid as
@@ -292,7 +292,7 @@ class Partition():
raise DiskError(f"Attempting to encrypt a partition that was not marked for encryption: {self}")
if not self.safe_to_format():
- log(f" * Partition {self} was marked as protected but encrypt() was called on it! * ", level=LOG_LEVELS.Error, fg='red')
+ log(f"Partition {self} was marked as protected but encrypt() was called on it!", level=LOG_LEVELS.Error, fg="red")
return False
handle = luks2(self, None, None)
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index c64079f6..758033a7 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -79,14 +79,14 @@ class Installer():
self.genfstab()
if not (missing_steps := self.post_install_check()):
- self.log('Installation completed without any errors. You may now reboot.', fg='green', level=LOG_LEVELS.Info)
+ self.log('Installation completed without any errors. You may now reboot.', bg='black', fg='green', level=LOG_LEVELS.Info)
self.sync_log_to_install_medium()
return True
else:
- self.log('Some required steps were not successfully installed/configured before leaving the installer:', fg='red', level=LOG_LEVELS.Warning)
+ self.log('Some required steps were not successfully installed/configured before leaving the installer:', bg='black', fg='red', level=LOG_LEVELS.Warning)
for step in missing_steps:
- self.log(f' - {step}', fg='red', level=LOG_LEVELS.Warning)
+ self.log(f' - {step}', bg='black', fg='red', level=LOG_LEVELS.Warning)
self.log(f"Detailed error logs can be found at: {storage['LOG_PATH']}", level=LOG_LEVELS.Warning)
self.log(f"Submit this zip file as an issue to https://github.com/archlinux/archinstall/issues", level=LOG_LEVELS.Warning)
@@ -168,7 +168,7 @@ class Installer():
return True
else:
self.log(
- f" * Timezone \"{zone}\" does not exist, continuing with system default * ",
+ f"Time zone {zone} does not exist, continuing with system default.",
level=LOG_LEVELS.Warning,
fg='red'
)
@@ -460,5 +460,5 @@ class Installer():
vconsole.write(f'KEYMAP={language}\n')
vconsole.write(f'FONT=lat9w-16\n')
else:
- self.log('Keyboard language was not changed from default (no language specified).', fg='yellow', level=LOG_LEVELS.Info)
+ self.log(f'Keyboard language was not changed from default (no language specified).', fg="yellow", level=LOG_LEVELS.Info)
return True
diff --git a/archinstall/lib/mirrors.py b/archinstall/lib/mirrors.py
index 57271bf8..04f47c0d 100644
--- a/archinstall/lib/mirrors.py
+++ b/archinstall/lib/mirrors.py
@@ -79,7 +79,7 @@ def list_mirrors():
try:
response = urllib.request.urlopen(url)
except urllib.error.URLError as err:
- log(f"Could not fetch an active mirror-list: {err}", level=LOG_LEVELS.Warning, fg='yellow')
+ log(f'Could not fetch an active mirror-list: {err}', level=LOG_LEVELS.Warning, fg="yellow")
return regions
diff --git a/archinstall/lib/output.py b/archinstall/lib/output.py
index eb23faf4..6b184b4b 100644
--- a/archinstall/lib/output.py
+++ b/archinstall/lib/output.py
@@ -100,12 +100,12 @@ def log(*args, **kwargs):
Path(absolute_logfile).parents[0].mkdir(exist_ok=True, parents=True)
except PermissionError:
# Fallback to creating the log file in the current folder
- err_string = f" * Not enough permission to place log file at {absolute_logfile}, creating it in {Path('./').absolute()/filename} instead * "
+ 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.parents[0].mkdir(exist_ok=True)
absolute_logfile = str(absolute_logfile)
storage['LOG_PATH'] = './'
- log(err_string, fg='red')
+ log(err_string, fg="red")
Path(absolute_logfile).touch() # Overkill?
diff --git a/archinstall/lib/user_interaction.py b/archinstall/lib/user_interaction.py
index ec6b6d34..572acf4f 100644
--- a/archinstall/lib/user_interaction.py
+++ b/archinstall/lib/user_interaction.py
@@ -22,7 +22,11 @@ def get_longest_option(options):
def check_for_correct_username(username):
if re.match(r'^[a-z_][a-z0-9_-]*\$?$', username) and len(username) <= 32:
return True
- log(' * The username you entered is invalid. Try again * ', fg='red')
+ log(
+ "The username you entered is invalid. Try again",
+ level=LOG_LEVELS.Warning,
+ fg='red'
+ )
return False
def do_countdown():
@@ -134,7 +138,8 @@ def ask_for_a_timezone():
return timezone
else:
log(
- f"* Specified timezone {timezone} does not exist * ",
+ f"Specified timezone {timezone} does not exist.",
+ level=LOG_LEVELS.Warning,
fg='red'
)
@@ -180,7 +185,8 @@ def ask_to_configure_network():
break
except ValueError:
log(
- 'You need to enter a valid IP in IP-config mode',
+ "You need to enter a valid IP in IP-config mode.",
+ level=LOG_LEVELS.Warning,
fg='red'
)
@@ -195,7 +201,8 @@ def ask_to_configure_network():
break
except ValueError:
log(
- 'You need to enter a valid gateway (router) IP address',
+ "You need to enter a valid gateway (router) IP address.",
+ level=LOG_LEVELS.Warning,
fg='red'
)
@@ -251,15 +258,15 @@ def generic_select(options, input_text="Select one of the above by index or abso
# Checking if options are different from `list` or `dict`
if type(options) not in [list, dict]:
log(f" * Generic select doesn't support ({type(options)}) as type of options * ", fg='red')
- log('If problem persists, please create an issue on https://github.com/archlinux/archinstall/issues', fg='yellow')
+ log(" * If problem persists, please create an issue on https://github.com/archlinux/archinstall/issues * ", fg='yellow')
raise RequirementError("generic_select() requires list or dictionary as options.")
# To allow only `list` and `dict`, converting values of options here.
# Therefore, now we can only provide the dictionary itself
if type(options) == dict: options = list(options.values())
if sort: options = sorted(options) # As we pass only list and dict (converted to list), we can skip converting to list
if len(options) == 0:
- log(' * Generic select didn\'t find any options to choose from * ', fg='red')
- log('If problem persists, please create an issue on https://github.com/archlinux/archinstall/issues', fg='yellow')
+ log(f" * Generic select didn't find any options to choose from * ", fg='red')
+ log(" * If problem persists, please create an issue on https://github.com/archlinux/archinstall/issues * ", fg='yellow')
raise RequirementError('generic_select() requires at least one option to proceed.')
@@ -391,7 +398,7 @@ def select_language(options, show_only_country_codes=True):
new_options = list(search_keyboard_layout(filter_string))
if len(new_options) <= 0:
- log(f"Search string '{filter_string}' yielded no results, please try another search", fg='yellow')
+ log(f"Search string '{filter_string}' yielded no results, please try another search.", fg='yellow')
continue
return select_language(new_options, show_only_country_codes=False)
@@ -404,7 +411,7 @@ def select_language(options, show_only_country_codes=True):
elif verify_keyboard_layout(selected_language):
return selected_language
else:
- log(' * Given language was not found * ', fg='red')
+ log(" * Given language wasn't found * ", fg='red')
raise RequirementError("Selecting languages require a least one language to be given as an option.")