Skip to content

Avoid KeyError when a bls directory is empty #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pefoley2 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Avoid KeyError when a bls directory is empty #67

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions ecleankernel/layout/blspec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def append_kernel_files(self,
ver: str,
module_dict: dict,
exclusions: typing.Container[KernelFileType] = [],
) -> Kernel:
) -> None:
fobj = GenericFile(path, ftype)

if ftype == KernelFileType.KERNEL:
Expand All @@ -95,8 +95,6 @@ def append_kernel_files(self,
if ftype not in exclusions:
k.all_files.append(fobj)

return k

def find_kernels(self,
exclusions: typing.Container[KernelFileType] = [],
) -> typing.List[Kernel]:
Expand All @@ -118,15 +116,16 @@ def find_kernels(self,
if dir_path.is_symlink() or not dir_path.is_dir():
continue

k = Kernel(ver, layout="bls")
kernels[(ver, "bls")] = Kernel(ver, layout="bls")

for fn in os.listdir(dir_path):
if fn.startswith('.'):
continue
kernels[(ver, "bls")] = self.append_kernel_files(
self.append_kernel_files(
self.name_map.get(fn, KernelFileType.MISC),
dir_path / fn,
k, ver, module_dict, exclusions)
kernels[(ver, "bls")], ver, module_dict, exclusions)

kernels[(ver, "bls")].all_files.append(
EmptyDirectory(dir_path))

Expand All @@ -145,10 +144,11 @@ def find_kernels(self,
# Not our UKI
continue

kernels[(ver, "uki")] = self.append_kernel_files(
kernels[(ver, "uki")] = Kernel(ver, layout="uki")
self.append_kernel_files(
KernelFileType.KERNEL,
self.ukidir / file,
Kernel(ver, layout="uki"),
kernels[(ver, "uki")],
ver, module_dict,
exclusions)

Expand Down