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

Remove some redundant parenthesis

This commit is contained in:
Dylan Taylor 2021-05-15 15:18:46 -04:00
parent 55b09aa1eb
commit f7642786c9
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
archinstall/lib/disk.py
View File

@ -179,11 +179,11 @@ class Partition:
if self.mountpoint != mount_information.get('target', None) and mountpoint: if self.mountpoint != mount_information.get('target', None) and mountpoint:
raise DiskError(f"{self} was given a mountpoint but the actual mountpoint differs: {mount_information.get('target', None)}") raise DiskError(f"{self} was given a mountpoint but the actual mountpoint differs: {mount_information.get('target', None)}")
if (target := mount_information.get('target', None)): if target := mount_information.get('target', None):
self.mountpoint = target self.mountpoint = target
if not self.filesystem and autodetect_filesystem: if not self.filesystem and autodetect_filesystem:
if (fstype := mount_information.get('fstype', get_filesystem_type(path))): if fstype := mount_information.get('fstype', get_filesystem_type(path)):
self.filesystem = fstype self.filesystem = fstype
if self.filesystem == 'crypto_LUKS': if self.filesystem == 'crypto_LUKS':
@ -236,7 +236,7 @@ class Partition:
@property @property
def real_device(self): def real_device(self):
for blockdevice in json.loads(b''.join(sys_command('lsblk -J')).decode('UTF-8'))['blockdevices']: for blockdevice in json.loads(b''.join(sys_command('lsblk -J')).decode('UTF-8'))['blockdevices']:
if (parent := self.find_parent_of(blockdevice, os.path.basename(self.path))): if parent := self.find_parent_of(blockdevice, os.path.basename(self.path)):
return f"/dev/{parent}" return f"/dev/{parent}"
# raise DiskError(f'Could not find appropriate parent for encrypted partition {self}') # raise DiskError(f'Could not find appropriate parent for encrypted partition {self}')
return self.path return self.path
@ -373,7 +373,7 @@ class Partition:
return parent return parent
elif 'children' in data: elif 'children' in data:
for child in data['children']: for child in data['children']:
if (parent := self.find_parent_of(child, name, parent=data['name'])): if parent := self.find_parent_of(child, name, parent=data['name']):
return parent return parent
def mount(self, target, fs=None, options=''): def mount(self, target, fs=None, options=''):
@ -403,7 +403,7 @@ class Partition:
# Without to much research, it seams that low error codes are errors. # Without to much research, it seams that low error codes are errors.
# And above 8k is indicators such as "/dev/x not mounted.". # And above 8k is indicators such as "/dev/x not mounted.".
# So anything in between 0 and 8k are errors (?). # So anything in between 0 and 8k are errors (?).
if exit_code > 0 and exit_code < 8000: if 0 < exit_code < 8000:
raise err raise err
self.mountpoint = None self.mountpoint = None

8
archinstall/lib/installer.py
View File

@ -107,7 +107,7 @@ class Installer:
# Copy over the install log (if there is one) to the install medium if # Copy over the install log (if there is one) to the install medium if
# at least the base has been strapped in, otherwise we won't have a filesystem/structure to copy to. # at least the base has been strapped in, otherwise we won't have a filesystem/structure to copy to.
if self.helper_flags.get('base-strapped', False) is True: if self.helper_flags.get('base-strapped', False) is True:
if (filename := storage.get('LOG_FILE', None)): if filename := storage.get('LOG_FILE', None):
absolute_logfile = os.path.join(storage.get('LOG_PATH', './'), filename) absolute_logfile = os.path.join(storage.get('LOG_PATH', './'), filename)
if not os.path.isdir(f"{self.target}/{os.path.dirname(absolute_logfile)}"): if not os.path.isdir(f"{self.target}/{os.path.dirname(absolute_logfile)}"):
@ -231,7 +231,7 @@ class Installer:
def copy_ISO_network_config(self, enable_services=False): def copy_ISO_network_config(self, enable_services=False):
# Copy (if any) iwd password and config files # Copy (if any) iwd password and config files
if os.path.isdir('/var/lib/iwd/'): if os.path.isdir('/var/lib/iwd/'):
if (psk_files := glob.glob('/var/lib/iwd/*.psk')): if psk_files := glob.glob('/var/lib/iwd/*.psk'):
if not os.path.isdir(f"{self.target}/var/lib/iwd"): if not os.path.isdir(f"{self.target}/var/lib/iwd"):
os.makedirs(f"{self.target}/var/lib/iwd") os.makedirs(f"{self.target}/var/lib/iwd")
@ -257,7 +257,7 @@ class Installer:
shutil.copy2(psk, f"{self.target}/var/lib/iwd/{os.path.basename(psk)}") shutil.copy2(psk, f"{self.target}/var/lib/iwd/{os.path.basename(psk)}")
# Copy (if any) systemd-networkd config files # Copy (if any) systemd-networkd config files
if (netconfigurations := glob.glob('/etc/systemd/network/*')): if netconfigurations := glob.glob('/etc/systemd/network/*'):
if not os.path.isdir(f"{self.target}/etc/systemd/network/"): if not os.path.isdir(f"{self.target}/etc/systemd/network/"):
os.makedirs(f"{self.target}/etc/systemd/network/") os.makedirs(f"{self.target}/etc/systemd/network/")
@ -426,7 +426,7 @@ class Installer:
## blkid doesn't trigger on loopback devices really well, ## blkid doesn't trigger on loopback devices really well,
## so we'll use the old manual method until we get that sorted out. ## so we'll use the old manual method until we get that sorted out.
if (real_device := self.detect_encryption(root_partition)): if real_device := self.detect_encryption(root_partition):
# TODO: We need to detect if the encrypted device is a whole disk encryption, # TODO: We need to detect if the encrypted device is a whole disk encryption,
# or simply a partition encryption. Right now we assume it's a partition (and we always have) # or simply a partition encryption. Right now we assume it's a partition (and we always have)
log(f"Identifying root partition by PART-UUID on {real_device}: '{real_device.uuid}'.", level=logging.DEBUG) log(f"Identifying root partition by PART-UUID on {real_device}: '{real_device.uuid}'.", level=logging.DEBUG)

8
archinstall/lib/mirrors.py
View File

@ -15,9 +15,9 @@ def filter_mirrors_by_region(regions, destination='/etc/pacman.d/mirrorlist', tm
region_list = [] region_list = []
for region in regions.split(','): for region in regions.split(','):
region_list.append(f'country={region}') region_list.append(f'country={region}')
o = b''.join(sys_command((f"/usr/bin/wget 'https://archlinux.org/mirrorlist/?{'&'.join(region_list)}&protocol=https&ip_version=4&ip_version=6&use_mirror_status=on' -O {tmp_dir}/mirrorlist"))) o = b''.join(sys_command(f"/usr/bin/wget 'https://archlinux.org/mirrorlist/?{'&'.join(region_list)}&protocol=https&ip_version=4&ip_version=6&use_mirror_status=on' -O {tmp_dir}/mirrorlist"))
o = b''.join(sys_command((f"/usr/bin/sed -i 's/#Server/Server/' {tmp_dir}/mirrorlist"))) o = b''.join(sys_command(f"/usr/bin/sed -i 's/#Server/Server/' {tmp_dir}/mirrorlist"))
o = b''.join(sys_command((f"/usr/bin/mv {tmp_dir}/mirrorlist {destination}"))) o = b''.join(sys_command(f"/usr/bin/mv {tmp_dir}/mirrorlist {destination}"))
return True return True
@ -71,7 +71,7 @@ def use_mirrors(regions: dict, destination='/etc/pacman.d/mirrorlist'):
def re_rank_mirrors(top=10, *positionals, **kwargs): def re_rank_mirrors(top=10, *positionals, **kwargs):
if sys_command((f'/usr/bin/rankmirrors -n {top} /etc/pacman.d/mirrorlist > /etc/pacman.d/mirrorlist')).exit_code == 0: if sys_command(f'/usr/bin/rankmirrors -n {top} /etc/pacman.d/mirrorlist > /etc/pacman.d/mirrorlist').exit_code == 0:
return True return True
return False return False

6
archinstall/lib/user_interaction.py
View File

@ -85,7 +85,7 @@ def do_countdown():
def get_password(prompt="Enter a password: "): def get_password(prompt="Enter a password: "):
while (passwd := getpass.getpass(prompt)): while passwd := getpass.getpass(prompt):
passwd_verification = getpass.getpass(prompt='And one more time for verification: ') passwd_verification = getpass.getpass(prompt='And one more time for verification: ')
if passwd != passwd_verification: if passwd != passwd_verification:
log(' * Passwords did not match * ', fg='red') log(' * Passwords did not match * ', fg='red')
@ -246,7 +246,7 @@ class MiniCurses:
return True return True
# Move back to the current known position (BACKSPACE doesn't updated x-pos) # Move back to the current known position (BACKSPACE doesn't updated x-pos)
sys.stdout.flush() sys.stdout.flush()
sys.stdout.write("\033[%dG" % (self._cursor_x)) sys.stdout.write("\033[%dG" % self._cursor_x)
sys.stdout.flush() sys.stdout.flush()
# Write a blank space # Write a blank space
@ -256,7 +256,7 @@ class MiniCurses:
# And move back again # And move back again
sys.stdout.flush() sys.stdout.flush()
sys.stdout.write("\033[%dG" % (self._cursor_x)) sys.stdout.write("\033[%dG" % self._cursor_x)
sys.stdout.flush() sys.stdout.flush()
self._cursor_x -= 1 self._cursor_x -= 1

2
docs/archinstall/general.rst
View File

@ -1,7 +1,7 @@
.. _archinstall.helpers: .. _archinstall.helpers:
.. warning:: .. warning::
All these helper functions are mostly, if not all, related to outside-installation-instructions. Meaning the calls will affect your current running system - and not touch your installed system. All these helper functions are mostly, if not all, related to outside-installation-instructions. Meaning the calls will affect your current running system - and not touch your installed system.
Profile related helpers Profile related helpers
======================= =======================

2
examples/guided.py
View File

@ -104,7 +104,7 @@ def ask_user_questions():
if not old_password: if not old_password:
old_password = input(f'Enter the old encryption password for {partition}: ') old_password = input(f'Enter the old encryption password for {partition}: ')
if (autodetected_filesystem := partition.detect_inner_filesystem(old_password)): if autodetected_filesystem := partition.detect_inner_filesystem(old_password):
new_filesystem = autodetected_filesystem new_filesystem = autodetected_filesystem
else: else:
archinstall.log("Could not auto-detect the filesystem inside the encrypted volume.", fg='red') archinstall.log("Could not auto-detect the filesystem inside the encrypted volume.", fg='red')