parchlinux-mobile/kupferbootstrap
1
0
Fork 1
mirror of https://gitlab.com/kupfer/kupferbootstrap.git synced 2025-02-23 13:45:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

packages/cli: linter fixes

Browse source
This commit is contained in:
InsanePrawn 2023-01-07 17:02:11 +01:00
parent f38fb798bc
commit 78874a15e6
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
image/image.py
View file

@ -64,7 +64,7 @@ def shrink_fs(loop_device: str, file: str, sector_size: int):
logging.debug(f'Finding end block of shrunken filesystem on {loop_device}p2') logging.debug(f'Finding end block of shrunken filesystem on {loop_device}p2')
blocks = int(re.search('is now [0-9]+', result.stdout.decode('utf-8')).group(0).split(' ')[2]) # type: ignore blocks = int(re.search('is now [0-9]+', result.stdout.decode('utf-8')).group(0).split(' ')[2]) # type: ignore
sectors = blocks * sectors_blocks_factor #+ 157812 - 25600 sectors = blocks * sectors_blocks_factor
logging.debug(f'Shrinking partition at {loop_device}p2 to {sectors} sectors') logging.debug(f'Shrinking partition at {loop_device}p2 to {sectors} sectors')
child_proccess = subprocess.Popen( child_proccess = subprocess.Popen(

22
packages/cli.py
View file

@ -224,15 +224,17 @@ def cmd_sideload(paths: Iterable[str], arch: Optional[Arch] = None, no_build: bo
logging.fatal("No packages matched") logging.fatal("No packages matched")
return return
scp_put_files(files, '/tmp').check_returncode() scp_put_files(files, '/tmp').check_returncode()
run_ssh_command([ run_ssh_command(
'sudo', [
'pacman', 'sudo',
'-U', 'pacman',
] + [os.path.join('/tmp', os.path.basename(file)) for file in files] + [ '-U',
'--noconfirm', *[os.path.join('/tmp', os.path.basename(file)) for file in files],
"'--overwrite=\\*'", '--noconfirm',
], "'--overwrite=\\*'",
alloc_tty=True).check_returncode() ],
alloc_tty=True,
).check_returncode()
CLEAN_LOCATIONS = ['src', 'pkg', *SRCINFO_CACHE_FILES] CLEAN_LOCATIONS = ['src', 'pkg', *SRCINFO_CACHE_FILES]
@ -439,7 +441,7 @@ def cmd_check(paths):
formatted = False formatted = False
reason = 'Found literal " although no special character was found in the line to justify the usage of a literal "' reason = 'Found literal " although no special character was found in the line to justify the usage of a literal "'
if "'" in line and not '"' in line: if "'" in line and '"' not in line:
formatted = False formatted = False
reason = 'Found literal \' although either a literal " or no qoutes should be used' reason = 'Found literal \' although either a literal " or no qoutes should be used'