Skip to content

Commit

Permalink
(#73) archive -> parent_archive in base.Bsp.from_archive
Browse files Browse the repository at this point in the history
  • Loading branch information
snake-biscuits committed Nov 7, 2024
1 parent 1fab057 commit 90ad2cd
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions bsp_tool/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,12 +148,12 @@ def unmount_file(self, filename: str):
self.extras.pop(filename)

@classmethod
def from_archive(cls, branch: ModuleType, filepath: str, archive, mount_extras=False) -> Bsp:
bsp = cls.from_bytes(branch, filepath, archive.read(filepath))
def from_archive(cls, branch: ModuleType, filepath: str, parent_archive, mount_extras=False) -> Bsp:
bsp = cls.from_bytes(branch, filepath, parent_archive.read(filepath))
if mount_extras:
extras = [
filename
for filename in archive.listdir(bsp.folder)
for filename in parent_archive.listdir(bsp.folder)
for pattern in bsp.extra_patterns()
if fnmatch.fnmatch(filename, pattern)]
for filename in extras:
Expand Down

0 comments on commit 90ad2cd

Please sign in to comment.