Skip to content

Commit c1c8813

Browse files
committed
Fix issues in gardenlinux.apt.DebsrcFile
Signed-off-by: Tobias Wolf <[email protected]>
1 parent 9873b27 commit c1c8813

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

src/gardenlinux/apt/debsource.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -88,24 +88,23 @@ def read(self, f: TextIO) -> None:
8888
:since: 0.7.0
8989
"""
9090

91-
current_source = current_version = None
91+
parsed_source = parsed_version = None
9292

9393
for line in f.readlines():
9494
if match := self.__re.match(line):
9595
if i := match["source"]:
96-
current_source = i
96+
parsed_source = i
9797
elif i := match["version"]:
98-
current_version = i
98+
parsed_version = i
9999
elif match["eso"]:
100-
current_source = current_version = None
100+
parsed_source = parsed_version = None
101101
elif match["eoe"] is not None:
102-
current_source = current_version = None
103-
break
102+
self._set_source(parsed_source, parsed_version)
103+
parsed_source = parsed_version = None
104104
else:
105105
raise RuntimeError(f"Unable to read line: {line}")
106106

107-
if current_source and current_version:
108-
self._set_source(current_source, current_version)
107+
self._set_source(parsed_source, parsed_version)
109108

110109
def _set_source(self, source: str, version: str) -> None:
111110
"""
@@ -114,7 +113,8 @@ def _set_source(self, source: str, version: str) -> None:
114113
:since: 0.7.0
115114
"""
116115

117-
self[source] = Debsrc(
118-
deb_source=source,
119-
deb_version=version,
120-
)
116+
if source and version:
117+
self[source] = Debsrc(
118+
deb_source=source,
119+
deb_version=version,
120+
)

tests/apt/__init__.py

Whitespace-only changes.

0 commit comments

Comments
 (0)